Changes in src/Patterns/Singleton.hpp [c3dbe0:6d574a]

File:

• src/Patterns/Singleton.hpp (modified) (3 diffs)

src/Patterns/Singleton.hpp

@@ -9 +9 @@
 #define SINGLETON_HPP_
 
-#include <cassert>
 #include <boost/thread.hpp>
 
+#include "Helpers/Assert.hpp"
 #include "defs.hpp"
 
@@ -181 +181 @@
 
     inline static void set(creator_T*&,creator_T*){
-      assert(0 && "Cannot set the Instance for a singleton of this type");
+      ASSERT(0, "Cannot set the Instance for a singleton of this type");
     }
   };
@@ -191 +191 @@
   struct creator_t<creator_T,false>{
     inline static creator_T* make(){
-      assert(0 && "Cannot create a singleton of this type directly");
+      ASSERT(0, "Cannot create a singleton of this type directly");
+      return 0;
     }
     inline static void set(ptr_t& dest,creator_T* src){