[Orxonox-commit 5738] r10398 - code/branches/core7/src/libraries/util

[landauf at orxonox.net]

Author: landauf
Date: 2015-04-26 13:34:31 +0200 (Sun, 26 Apr 2015)
New Revision: 10398

Modified:
   code/branches/core7/src/libraries/util/Singleton.h
Log:
improved output

Modified: code/branches/core7/src/libraries/util/Singleton.h
===================================================================
--- code/branches/core7/src/libraries/util/Singleton.h	2015-04-26 10:29:30 UTC (rev 10397)
+++ code/branches/core7/src/libraries/util/Singleton.h	2015-04-26 11:34:31 UTC (rev 10398)
@@ -111,9 +111,11 @@
 
 #include "UtilPrereqs.h"
 
-#include <cassert>
 #include <cstring>
+#include <typeinfo>
 
+#include "OrxAssert.h"
+
 namespace orxonox
 {
     /**
@@ -133,7 +135,7 @@
         //! Returns a reference to the singleton instance
         static T& getInstance()
         {
-            assert(T::singletonPtr_s != NULL);
+            OrxVerify(T::singletonPtr_s != NULL, "T=" << typeid(T).name());
             return *T::singletonPtr_s;
         }
 
@@ -156,14 +158,14 @@
         //! Constructor sets the singleton instance pointer
         Singleton()
         {
-            assert(T::singletonPtr_s == NULL);
+            OrxVerify(T::singletonPtr_s == NULL, "T=" << typeid(T).name());
             T::singletonPtr_s = static_cast<T*>(this);
         }
 
         //! Destructor resets the singleton instance pointer
         virtual ~Singleton()
         {
-            assert(T::singletonPtr_s != NULL);
+            OrxVerify(T::singletonPtr_s != NULL, "T=" << typeid(T).name());
             T::singletonPtr_s = NULL;
         }