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

cppbind: Fix detecting derived Ghosts

Browse Source
This commit is contained in:
Thomas Geymayer
2013-12-01 12:34:26 +01:00
parent dfb07f359e
commit 66193d7283
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
simgear/nasal/cppbind/Ghost.hxx
View File

@@ -67,6 +67,9 @@ namespace nasal
bool isBaseOf(naGhostType* ghost_type) const
{
if( ghost_type == _ghost_type_ptr )
return true;
for( DerivedList::const_iterator derived = _derived_classes.begin();
derived != _derived_classes.end();
++derived )
@@ -83,11 +86,14 @@ namespace nasal
typedef std::vector<const GhostMetadata*> DerivedList;
const std::string _name;
const naGhostType *_ghost_type_ptr;
DerivedList _derived_classes;
std::vector<naRef> _parents;
explicit GhostMetadata(const std::string& name):
_name(name)
GhostMetadata( const std::string& name,
const naGhostType* ghost_type ):
_name(name),
_ghost_type_ptr(ghost_type)
{
}
@@ -545,8 +551,6 @@ namespace nasal
{
if( !ghost_type )
return false;
if( ghost_type == &_ghost_type )
return true;
return getSingletonPtr()->GhostMetadata::isBaseOf(ghost_type);
}
@@ -806,7 +810,7 @@ namespace nasal
MemberMap _members;
explicit Ghost(const std::string& name):
GhostMetadata( name )
GhostMetadata(name, &_ghost_type)
{
_ghost_type.destroy = &destroyGhost;
_ghost_type.name = _name.c_str();