Changeset 5802 for code

Timestamp:

Sep 26, 2009, 11:06:24 PM (15 years ago)

Author:

landauf

Message:

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).

Location:

code/branches/core5/src

Files:

• libraries/util/ScopedSingleton.h (modified) (1 diff)
• orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)

code/branches/core5/src/libraries/util/ScopedSingleton.h

@@ -93 +93 @@
                 if (T::singletonPtr_s)
                 {
-                    delete T::singletonPtr_s;
+                    T::singletonPtr_s->destroy();
                     T::singletonPtr_s = 0;
                 }

code/branches/core5/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -56 +56 @@
                 // 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();
             }