Changeset 7126 in orxonox.OLD for trunk/src/lib

Timestamp:

Feb 13, 2006, 1:14:53 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the delete Mechanism of PNode seems to work again.
This is done by always deleting the first node, and not walking through a list, that is eleminated during deletion time

File:

• trunk/src/lib/coord/p_node.cc (modified) (4 diffs)

trunk/src/lib/coord/p_node.cc

@@ -80 +80 @@
 PNode::~PNode ()
 {
-  printf("delete PNode: %s::%s\n", this->getClassName(), this->getName());
+  PRINTF(4)("delete %s::%s\n", this->getClassName(), this->getName());
   // remove the Node, delete it's children (if required).
   std::list<PNode*>::iterator tmp = this->children.begin();
   std::list<PNode*>::iterator deleteNode;
+  unsigned int size;
   while(!this->children.empty())
-    while (tmp != this->children.end())
+  {
+    tmp = this->children.begin();
+    //while (tmp != this->children.end())
     {
       deleteNode = tmp;
       tmp++;
-      //      printf("TEST::%s(%s) %s\n", (*deleteNode)->getName(), (*deleteNode)->getClassName(), this->getName());
+      size = this->children.size();
       if ((this->parentMode & PNODE_PROHIBIT_CHILD_DELETE) ||
           ((*deleteNode)->parentMode & PNODE_PROHIBIT_DELETE_WITH_PARENT))
@@ -95 +98 @@
         if (this == PNode::nullParent && (*deleteNode)->parentMode & PNODE_REPARENT_TO_NULL)
         {
-          printf("%s::%s deletes PNode: %s::%s\n",
+          PRINTF(4)("%s::%s deletes %s::%s\n",
                  this->getClassName(), this->getName(),
                  (*deleteNode)->getClassName(), (*deleteNode)->getName());
@@ -102 +105 @@
         else
         {
-          printf("%s::%s reparents PNode: %s::%s\n",
+          PRINTF(4)("%s::%s reparents %s::%s\n",
                  this->getClassName(), this->getName(),
                  (*deleteNode)->getClassName(), (*deleteNode)->getName());
-
           (*deleteNode)->reparent();
         }
@@ -111 +113 @@
       else
       {
-        printf("%s::%s deletes PNode: %s::%s\n",
+        PRINTF(4)("%s::%s deletes PNode: %s::%s\n",
                this->getClassName(), this->getName(),
                (*deleteNode)->getClassName(), (*deleteNode)->getName());
         delete (*deleteNode);
       }
+      //if (size <= this->children.size()) break;
     }
+  }
 
   if (this->parent != NULL)