Changeset 6431

Timestamp:

Dec 29, 2009, 7:16:36 PM (14 years ago)

Author:

rgrieder

Message:

Extended Singleton<T> with a exists() method.

File:

• code/branches/gamestate/src/libraries/util/Singleton.h (modified) (3 diffs)

code/branches/gamestate/src/libraries/util/Singleton.h

@@ -51 +51 @@
         static T& getInstance()
         {
-            assert(T::singletonPtr_s != 0);
+            assert(T::singletonPtr_s != NULL);
             return *T::singletonPtr_s;
+        }
+
+        //! Tells whether the singleton has been created
+        static bool exists()
+        {
+            return (T::singletonPtr_s != NULL);
         }
 
@@ -68 +74 @@
         Singleton()
         {
-            assert(T::singletonPtr_s == 0);
+            assert(T::singletonPtr_s == NULL);
             T::singletonPtr_s = static_cast<T*>(this);
         }
@@ -75 +81 @@
         ~Singleton()
         {
-            assert(T::singletonPtr_s != 0);
-            T::singletonPtr_s = 0;
+            assert(T::singletonPtr_s != NULL);
+            T::singletonPtr_s = NULL;
         }