Changeset 9807 in orxonox.OLD for branches/new_class_id/src/lib/lang/base_object.cc

Timestamp:

Sep 24, 2006, 11:26:48 PM (18 years ago)

Author:

bensch

Message:

some more DEBUG-functionality to the ObjectList… something is not quite right… i wonder, what this might be…

File:

• branches/new_class_id/src/lib/lang/base_object.cc (modified) (7 diffs)

branches/new_class_id/src/lib/lang/base_object.cc

@@ -32 +32 @@
   this->objectName = objectName;
   this->xmlElem = NULL;
+  this->registerObject(this, BaseObject::_objectList);
 }
 
@@ -40 +41 @@
 {
   /// Remove from the ObjectLists
-  ClassList::iterator it;
+  ClassEntries::iterator it;
+  printf("Deleting Object of type %s::%s\n", this->getClassCName(), getCName());
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
   {
+    assert((*it)._objectList->checkIteratorInList((*it)._iterator) || (*it)._objectList->checkObjectInList(this));
     (*it)._objectList->unregisterObject((*it)._iterator);
     delete (*it)._iterator;
@@ -87 +90 @@
 bool BaseObject::isA(const ObjectListBase& objectList) const
 {
-  ClassList::const_iterator it;
+  ClassEntries::const_iterator it;
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
     if ((*it)._objectList == &objectList)
@@ -102 +105 @@
 bool BaseObject::isA(const ClassID& classID) const
 {
-  ClassList::const_iterator it;
+  ClassEntries::const_iterator it;
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
     if (*(*it)._objectList == classID)
@@ -116 +119 @@
 bool BaseObject::isA(int classID) const
 {
-  ClassList::const_iterator it;
+  ClassEntries::const_iterator it;
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
     if (*(*it)._objectList == classID)
+
       return true;
   return false;
@@ -130 +134 @@
 bool BaseObject::isA(const std::string& className) const
 {
-  ClassList::const_iterator it;
+  ClassEntries::const_iterator it;
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
     if (*(*it)._objectList == className)
@@ -146 +150 @@
 {
   PRINT(0)("Listing inheritance diagram for %s::%s: ", getClassCName(), getCName());
-  ClassList::const_iterator it;
+  ClassEntries::const_iterator it;
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
     PRINT(0)(" -> %s(id:%d)", (*it)._objectList->name().c_str(), (*it)._objectList->id());