Changeset 3367 for code/branches

Timestamp:

Jul 29, 2009, 11:47:22 PM (15 years ago)

Author:

rgrieder

Message:

Build fixes

File:

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

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

@@ -31 +31 @@
 
 #include "UtilPrereqs.h"
+#include <cassert>
 
 namespace orxonox
@@ -50 +51 @@
         static T& getInstance()
         {
-            assert(T::singletonPtr_s != NULL);
+            assert(T::singletonPtr_s != 0);
             return *T::singletonPtr_s;
         }
@@ -58 +59 @@
         Singleton()
         {
-            assert(T::singletonPtr_s == NULL);
+            assert(T::singletonPtr_s == 0);
             T::singletonPtr_s = static_cast<T*>(this);
         }
@@ -65 +66 @@
         ~Singleton()
         {
-            assert(T::singletonPtr_s != NULL);
-            T::singletonPtr_s = NULL;
+            assert(T::singletonPtr_s != 0);
+            T::singletonPtr_s = 0;
         }