[Orxonox-commit 1081] r5802 - in code/branches/core5/src: libraries/util orxonox/collisionshapes

[landauf at orxonox.net]

Author: landauf
Date: 2009-09-26 23:06:24 +0200 (Sat, 26 Sep 2009)
New Revision: 5802

Modified:
   code/branches/core5/src/libraries/util/ScopedSingleton.h
   code/branches/core5/src/orxonox/collisionshapes/CompoundCollisionShape.cc
Log:
Found another delete in CompoundCollisionShape.cc
Also replaced delete with destroy() in ScopedSingleton, which means it only works with OrxonoxClasses (this works with the two classes inheriting from ScopedSingleton atm).

Modified: code/branches/core5/src/libraries/util/ScopedSingleton.h
===================================================================
--- code/branches/core5/src/libraries/util/ScopedSingleton.h	2009-09-26 20:25:03 UTC (rev 5801)
+++ code/branches/core5/src/libraries/util/ScopedSingleton.h	2009-09-26 21:06:24 UTC (rev 5802)
@@ -92,7 +92,7 @@
             {
                 if (T::singletonPtr_s)
                 {
-                    delete T::singletonPtr_s;
+                    T::singletonPtr_s->destroy();
                     T::singletonPtr_s = 0;
                 }
             }

Modified: code/branches/core5/src/orxonox/collisionshapes/CompoundCollisionShape.cc
===================================================================
--- code/branches/core5/src/orxonox/collisionshapes/CompoundCollisionShape.cc	2009-09-26 20:25:03 UTC (rev 5801)
+++ code/branches/core5/src/orxonox/collisionshapes/CompoundCollisionShape.cc	2009-09-26 21:06:24 UTC (rev 5802)
@@ -55,7 +55,7 @@
             {
                 // make sure that the child doesn't want to detach itself --> speedup because of the missing update
                 it->first->notifyDetached();
-                delete it->first;
+                it->first->destroy();
             }
 
             delete this->compoundShape_;