Fix missing include in simgear/misc/strutils_test.cxx

[simgear.git] / simgear / hla / HLAFederate.hxx

diff --git a/simgear/hla/HLAFederate.hxx b/simgear/hla/HLAFederate.hxx
index be052130178ff0bf5afa6e91dc9541eef877aabd..ab5fa57e12230c0cc6c2e94ced189ac8a10d15fc 100644 (file)
--- a/simgear/hla/HLAFederate.hxx
+++ b/simgear/hla/HLAFederate.hxx
@@ -162,31 +162,6 @@ public:
     /// a pending time advance is granted.
     bool processMessages();
 
-    /// Legacy tick call - deprecated
-    bool tick(const double& minimum, const double& maximum);
-
-    class ObjectModelFactory {
-    public:
-        virtual ~ObjectModelFactory()
-        { }
-
-        virtual HLAObjectClass* createObjectClass(const std::string& name, HLAFederate& federate)
-        { return federate.createObjectClass(name); }
-        virtual bool subscribeObjectClass(const std::string& objectClassName, const std::string& sharing)
-        { return sharing.find("Subscribe") != std::string::npos; }
-        virtual bool publishObjectClass(const std::string& objectClassName, const std::string& sharing)
-        { return sharing.find("Publish") != std::string::npos; }
-        virtual bool subscribeAttribute(const std::string& objectClassName, const std::string& attributeName, const std::string& sharing)
-        { return sharing.find("Subscribe") != std::string::npos; }
-        virtual bool publishAttribute(const std::string& objectClassName, const std::string& attributeName, const std::string& sharing)
-        { return sharing.find("Publish") != std::string::npos; }
-
-    };
-
-    /// Read an omt xml file - deprecated
-    bool readObjectModelTemplate(const std::string& objectModel,
-                                 ObjectModelFactory& objectModelFactory);
-
     /// Read an rti1.3 omt xml file
     bool readRTI13ObjectModelTemplate(const std::string& objectModel);
     /// Read an rti1516 omt xml file
@@ -251,11 +226,11 @@ private:
     void _clearRTI();
 
     /// Internal helpers for interaction classes
-    bool _insertInteractionClass(const SGSharedPtr<HLAInteractionClass>& interactionClass);
+    bool _insertInteractionClass(HLAInteractionClass* interactionClass);
     /// Internal helpers for object classes
-    bool _insertObjectClass(const SGSharedPtr<HLAObjectClass>& objectClass);
+    bool _insertObjectClass(HLAObjectClass* objectClass);
     /// Internal helpers for object instances
-    bool _insertObjectInstance(const SGSharedPtr<HLAObjectInstance>& objectInstance);
+    bool _insertObjectInstance(HLAObjectInstance* objectInstance);
     void _eraseObjectInstance(const std::string& name);
 
     /// The underlying interface to the rti implementation