Changes in src/Patterns/Singleton_impl.hpp [6d574a:0f6f3a]

File:

• src/Patterns/Singleton_impl.hpp (modified) (2 diffs)

src/Patterns/Singleton_impl.hpp

@@ -72 +72 @@
 template <class T,bool _may_create>
 void Singleton<T,_may_create>::setInstance(T* newInstance){
-  ASSERT(!theInstance.get(), "Trying to set the instance of an already created singleton");
+  assert(!theInstance.get() && "Trying to set the instance of an already created singleton");
   boost::recursive_mutex::scoped_lock guard(instanceLock);
   theInstance.reset(newInstance);
@@ -83 +83 @@
 template <class T, bool _may_create>
 Singleton<T,_may_create>::Singleton(const Singleton<T,_may_create>&){
-  ASSERT(0, "Copy constructor of singleton template called");
+  assert(0 && "Copy constructor of singleton template called");
 }