Changeset 9667 for code/trunk/src/libraries/util/ScopedSingletonManager.h

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/util/ScopedSingletonManager.h (modified) (3 diffs)

code/trunk/src/libraries/util/ScopedSingletonManager.h

@@ -68 +68 @@
 namespace orxonox
 {
-    class OrxonoxClass;
+    class Destroyable;
 
     /**
@@ -166 +166 @@
         }
 
-        //! Destroys the singleton instance - overloaded for OrxonoxClass, calls OrxonoxClass::destroy()
-        void destroy(OrxonoxClass*)
+        //! Destroys the singleton instance - overloaded for Destroyable, calls Destroyable::destroy()
+        void destroy(Destroyable*)
         {
             singletonPtr_->destroy();
@@ -246 +246 @@
         }
 
-        //! Destroys the singleton instance - overloaded for OrxonoxClass, calls OrxonoxClass::destroy()
-        void destroy(OrxonoxClass*)
+        //! Destroys the singleton instance - overloaded for Destroyable, calls Destroyable::destroy()
+        void destroy(Destroyable*)
         {
             singletonPtr_->destroy();