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

Timestamp:

Mar 13, 2005, 11:19:00 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: added some more files to the new destructor-type

Location:

orxonox/trunk/src/lib/coord

Files:

• helper_parent.cc (modified) (1 diff)
• helper_parent.h (modified) (1 diff)
• null_parent.cc (modified) (1 diff)
• null_parent.h (modified) (1 diff)

orxonox/trunk/src/lib/coord/helper_parent.cc

@@ -39 +39 @@
    \todo this deconstructor is not jet implemented - do it
 */
-HelperParent::~HelperParent () {}
+HelperParent::~HelperParent () 
+{
+  this->destroy();
+}
 
+
+/**
+   \brief destroys all allocated memory
+*/
+void HelperParent::destroy(void)
+{
+
+
+  static_cast<PNode*>(this)->destroy();
+}

orxonox/trunk/src/lib/coord/helper_parent.h

@@ -17 +17 @@
  public:
   HelperParent ();
-  ~HelperParent ();
-
+  virtual ~HelperParent ();
+  void destroy(void);
 
 };

orxonox/trunk/src/lib/coord/null_parent.cc

@@ -61 +61 @@
 NullParent::~NullParent () 
 {
+  this->destroy();
+}
+
+/**
+   \brief destroys all allocated memory
+*/
+void NullParent::destroy(void)
+{
   //delete singletonRef;
   singletonRef = NULL;
+
+  static_cast<PNode*>(this)->destroy();
 }
-
 
 

orxonox/trunk/src/lib/coord/null_parent.h

@@ -16 +16 @@
  public:
   static NullParent* getInstance ();
-  ~NullParent ();
+  virtual ~NullParent ();
+  void destroy(void);
   
+
   static NullParent* singletonRef;