[Orxonox-commit 857] r3367 - branches/resource/src/util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-07-29 23:47:22 +0200 (Wed, 29 Jul 2009)
New Revision: 3367

Modified:
   branches/resource/src/util/Singleton.h
Log:
Build fixes

Modified: branches/resource/src/util/Singleton.h
===================================================================
--- branches/resource/src/util/Singleton.h	2009-07-29 20:27:10 UTC (rev 3366)
+++ branches/resource/src/util/Singleton.h	2009-07-29 21:47:22 UTC (rev 3367)
@@ -30,6 +30,7 @@
 #define __Util_Singleton_H__
 
 #include "UtilPrereqs.h"
+#include <cassert>
 
 namespace orxonox
 {
@@ -49,7 +50,7 @@
         //! Returns a reference to the singleton instance
         static T& getInstance()
         {
-            assert(T::singletonPtr_s != NULL);
+            assert(T::singletonPtr_s != 0);
             return *T::singletonPtr_s;
         }
 
@@ -57,15 +58,15 @@
         //! Constructor sets the singleton instance pointer
         Singleton()
         {
-            assert(T::singletonPtr_s == NULL);
+            assert(T::singletonPtr_s == 0);
             T::singletonPtr_s = static_cast<T*>(this);
         }
 
         //! Constructor resets the singleton instance pointer
         ~Singleton()
         {
-            assert(T::singletonPtr_s != NULL);
-            T::singletonPtr_s = NULL;
+            assert(T::singletonPtr_s != 0);
+            T::singletonPtr_s = 0;
         }
 
     private: