Changeset 6071 in orxonox.OLD for trunk

Timestamp:

Dec 12, 2005, 6:38:23 PM (19 years ago)

Author:

bensch

Message:

trunk: sync

Location:

trunk

Files:

• scripts/valgrind/nv.sup (moved) (moved from trunk/scripts/valgrind/nvidia.suppression)
• src/lib/coord/p_node.cc (modified) (2 diffs)
• src/lib/coord/p_node.h (modified) (2 diffs)

trunk/src/lib/coord/p_node.cc

@@ -84 +84 @@
 PNode::~PNode ()
 {
+  if (this->parent != NULL)
+   {
+     this->parent->children.remove(this);
+     this->parent = NULL;
+   }
+
   // remove the Node, delete it's children (if required).
   std::list<PNode*>::iterator tmp = this->children.begin();
@@ -95 +101 @@
       delete (*deleteNode);
   }
-  if (this->parent != NULL)
-   {
-     this->parent->children.remove(this);
-     this->parent = NULL;
-   }
 
   // remove all other allocated memory.

trunk/src/lib/coord/p_node.h

@@ -136 +136 @@
   void removeChild (PNode* child);
   void removeNode();
-  const std::list<PNode*>& getNodesChildren() const { return this->children; };
 
   /** @param parent the new parent of this node */
@@ -144 +143 @@
   inline PNode* getParent () const { return this->parent; };
   /** @returns the List of Children of this PNode */
- // inline const tList<PNode>* getChildren() const { return this->children; };
+  const std::list<PNode*>& getNodesChildren() const { return this->children; };
 
   void setParentSoft(PNode* parentNode, float bias = 1.0);