hla: Remove deprecated methods from HLAObjectClass

diff --git a/simgear/hla/HLAObjectClass.cxx b/simgear/hla/HLAObjectClass.cxx
index c3f81c7ba82cc172bd5d12102a0d2799ac49fbec..3385f6952ad0c7c9a217377106c81a3b91fa2d7b 100644 (file)
--- a/simgear/hla/HLAObjectClass.cxx
+++ b/simgear/hla/HLAObjectClass.cxx
@@ -299,21 +299,12 @@ HLAObjectClass::stopRegistration() const
 HLAObjectInstance*
 HLAObjectClass::createObjectInstance(const std::string& name)
 {
-    HLAObjectInstance* objectInstance = createObjectInstance();
-    if (objectInstance)
-        return objectInstance;
     SGSharedPtr<HLAFederate> federate = _federate.lock();
     if (!federate.valid())
         return 0;
     return federate->createObjectInstance(this, name);
 }
 
-HLAObjectInstance*
-HLAObjectClass::createObjectInstance()
-{
-    return 0;
-}
-
 void
 HLAObjectClass::_setRTIObjectClass(RTIObjectClass* objectClass)
 {

diff --git a/simgear/hla/HLAObjectClass.hxx b/simgear/hla/HLAObjectClass.hxx
index 6a04f4a12f2ecb41b6ca5471316028e21de344a2..ba6ee5c911cf632c10cd3c5202b4614c9c46156a 100644 (file)
--- a/simgear/hla/HLAObjectClass.hxx
+++ b/simgear/hla/HLAObjectClass.hxx
@@ -120,7 +120,6 @@ public:
 
     /// Create a new instance of this class.
     virtual HLAObjectInstance* createObjectInstance(const std::string& name);
-    virtual HLAObjectInstance* createObjectInstance(); // deprecated
 
 private:
     HLAObjectClass(const HLAObjectClass&);