Changeset 3366 for code/branches/resource/src/util/Singleton.h

Timestamp:

Jul 29, 2009, 10:27:10 PM (15 years ago)

Author:

rgrieder

Message:

Derived all singletons implemented in a usual manner from orxonox::Singleton<T>.
This resolves inconsistencies with the singletonPtr_s variable in case of exceptions (asserts were being triggered then).
And while at it replaced singletonRef_s with singletonPtr_s for it to be less misleading (as fabian has already pointed out).

File:

• code/branches/resource/src/util/Singleton.h (modified) (2 diffs)

code/branches/resource/src/util/Singleton.h

@@ -40 +40 @@
         Usage:
         Inherit publicly from Singleton<MyClass> and provide access to
-        MyClass::singletonRef_s.
-        This can be done with a friend declaration.
+        MyClass::singletonPtr_s.
+        This can easily be done with a friend declaration.
     */
     template <class T>
@@ -50 +50 @@
         static T& getInstance()
         {
-            assert(T::singletonRef_s != NULL);
-            return *T::singletonRef_s;
+            assert(T::singletonPtr_s != NULL);
+            return *T::singletonPtr_s;
         }
 
     protected:
-        // Constructor sets the singleton instance pointer
+        //! Constructor sets the singleton instance pointer
         Singleton()
         {
-            assert(T::singletonRef_s == NULL);
-            T::singletonRef_s = static_cast<T*>(this);
+            assert(T::singletonPtr_s == NULL);
+            T::singletonPtr_s = static_cast<T*>(this);
         }
-        // Constructor resets the singleton instance pointer
+
+        //! Constructor resets the singleton instance pointer
         ~Singleton()
         {
-            assert(T::singletonRef_s != NULL);
-            T::singletonRef_s = NULL;
+            assert(T::singletonPtr_s != NULL);
+            T::singletonPtr_s = NULL;
         }