hla: Use raw pointers for HLAFederate::_insert methods.

diff --git a/simgear/hla/HLAFederate.cxx b/simgear/hla/HLAFederate.cxx
index d39d8aaa4ad5f2c9c938ab61aec822f6e2de883c..d52dbccae8f480c284e847bdd814d7beb17157c6 100644 (file)
--- a/simgear/hla/HLAFederate.cxx
+++ b/simgear/hla/HLAFederate.cxx
@@ -1129,9 +1129,9 @@ HLAFederate::_clearRTI()
 }
 
 bool
 }
 
 bool

-HLAFederate::_insertInteractionClass(const SGSharedPtr<HLAInteractionClass>& interactionClass)
+HLAFederate::_insertInteractionClass(HLAInteractionClass* interactionClass)

 {
 {

-    if (!interactionClass.valid())
+    if (!interactionClass)

         return false;
     if (_interactionClassMap.find(interactionClass->getName()) != _interactionClassMap.end()) {
         SG_LOG(SG_IO, SG_ALERT, "HLA: _insertInteractionClass: object instance with name \""
         return false;
     if (_interactionClassMap.find(interactionClass->getName()) != _interactionClassMap.end()) {
         SG_LOG(SG_IO, SG_ALERT, "HLA: _insertInteractionClass: object instance with name \""


@@ -1143,9 +1143,9 @@ HLAFederate::_insertInteractionClass(const SGSharedPtr<HLAInteractionClass>& int
 }
 
 bool
 }
 
 bool

-HLAFederate::_insertObjectClass(const SGSharedPtr<HLAObjectClass>& objectClass)
+HLAFederate::_insertObjectClass(HLAObjectClass* objectClass)

 {
 {

-    if (!objectClass.valid())
+    if (!objectClass)

         return false;
     if (_objectClassMap.find(objectClass->getName()) != _objectClassMap.end()) {
         SG_LOG(SG_IO, SG_ALERT, "HLA: _insertObjectClass: object instance with name \""
         return false;
     if (_objectClassMap.find(objectClass->getName()) != _objectClassMap.end()) {
         SG_LOG(SG_IO, SG_ALERT, "HLA: _insertObjectClass: object instance with name \""


@@ -1157,9 +1157,9 @@ HLAFederate::_insertObjectClass(const SGSharedPtr<HLAObjectClass>& objectClass)
 }
 
 bool
 }
 
 bool

-HLAFederate::_insertObjectInstance(const SGSharedPtr<HLAObjectInstance>& objectInstance)
+HLAFederate::_insertObjectInstance(HLAObjectInstance* objectInstance)

 {
 {

-    if (!objectInstance.valid())
+    if (!objectInstance)

         return false;
     if (objectInstance->getName().empty()) {
         SG_LOG(SG_IO, SG_ALERT, "HLA: _insertObjectInstance: trying to insert object instance with empty name!");
         return false;
     if (objectInstance->getName().empty()) {
         SG_LOG(SG_IO, SG_ALERT, "HLA: _insertObjectInstance: trying to insert object instance with empty name!");

diff --git a/simgear/hla/HLAFederate.hxx b/simgear/hla/HLAFederate.hxx
index 4b1d4164869c40d1dec86f1b6fccf2015430d8d5..ab5fa57e12230c0cc6c2e94ced189ac8a10d15fc 100644 (file)
--- a/simgear/hla/HLAFederate.hxx
+++ b/simgear/hla/HLAFederate.hxx
@@ -226,11 +226,11 @@ private:
     void _clearRTI();
 
     /// Internal helpers for interaction classes
     void _clearRTI();
 
     /// Internal helpers for interaction classes

-    bool _insertInteractionClass(const SGSharedPtr<HLAInteractionClass>& interactionClass);
+    bool _insertInteractionClass(HLAInteractionClass* interactionClass);

     /// Internal helpers for object classes
     /// Internal helpers for object classes

-    bool _insertObjectClass(const SGSharedPtr<HLAObjectClass>& objectClass);
+    bool _insertObjectClass(HLAObjectClass* objectClass);

     /// Internal helpers for object instances
     /// 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
     void _eraseObjectInstance(const std::string& name);
 
     /// The underlying interface to the rti implementation