Changeset 10398 for code/branches/core7/src

Timestamp:

Apr 26, 2015, 1:34:31 PM (10 years ago)

Author:

landauf

Message:

improved output

File:

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

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

@@ -112 +112 @@
 #include "UtilPrereqs.h"
 
-#include <cassert>
 #include <cstring>
+#include <typeinfo>
+
+#include "OrxAssert.h"
 
 namespace orxonox
@@ -134 +136 @@
         static T& getInstance()
         {
-            assert(T::singletonPtr_s != NULL);
+            OrxVerify(T::singletonPtr_s != NULL, "T=" << typeid(T).name());
             return *T::singletonPtr_s;
         }
@@ -157 +159 @@
         Singleton()
         {
-            assert(T::singletonPtr_s == NULL);
+            OrxVerify(T::singletonPtr_s == NULL, "T=" << typeid(T).name());
             T::singletonPtr_s = static_cast<T*>(this);
         }
@@ -164 +166 @@
         virtual ~Singleton()
         {
-            assert(T::singletonPtr_s != NULL);
+            OrxVerify(T::singletonPtr_s != NULL, "T=" << typeid(T).name());
             T::singletonPtr_s = NULL;
         }