FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mathias Froehlich
2012-11-08 21:31:16 +01:00
parent 6c111f55aa
commit 1f585d6719
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
simgear/hla/HLAFederate.cxx
View File

@@ -1129,9 +1129,9 @@ HLAFederate::_clearRTI()
}
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 \""
@@ -1143,9 +1143,9 @@ HLAFederate::_insertInteractionClass(const SGSharedPtr<HLAInteractionClass>& int
}
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 \""
@@ -1157,9 +1157,9 @@ HLAFederate::_insertObjectClass(const SGSharedPtr<HLAObjectClass>& objectClass)
}
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!");

6
simgear/hla/HLAFederate.hxx
View File

@@ -226,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