Changes in src/World.cpp [a77c96:23b547]

File:

• src/World.cpp (modified) (3 diffs)

src/World.cpp

@@ -16 +16 @@
 #include "Descriptors/MoleculeDescriptor_impl.hpp"
 #include "Actions/ManipulateAtomsProcess.hpp"
+
+#include "Patterns/Singleton_impl.hpp"
 
 using namespace std;
@@ -229 +231 @@
 /******************************* Singleton Stuff **************************/
 
-// TODO: Hide boost-thread using Autotools stuff when no threads are used
-World* World::theWorld = 0;
-boost::mutex World::worldLock;
-
 World::World() :
     periode(new periodentafel),
@@ -261 +259 @@
 }
 
-World* World::get(){
-  // boost supports RAII-Style locking, so we don't need to unlock
-  boost::mutex::scoped_lock guard(worldLock);
-  if(!theWorld) {
-    theWorld = new World();
-  }
-  return theWorld;
-}
-
-void World::destroy(){
-  // boost supports RAII-Style locking, so we don't need to unlock
-  boost::mutex::scoped_lock guard(worldLock);
-  delete theWorld;
-  theWorld = 0;
-}
-
-World* World::reset(){
-  World* oldWorld = 0;
-  {
-    // boost supports RAII-Style locking, so we don't need to unlock
-    boost::mutex::scoped_lock guard(worldLock);
-
-    oldWorld = theWorld;
-    theWorld = new World();
-    // oldworld does not need protection any more,
-    // since we should have the only reference
-
-    // worldLock handles access to the pointer,
-    // not to the object
-  } // scope-end releases the lock
-
-  // we have to let all the observers know that the
-  // oldWorld was destroyed. oldWorld calls subjectKilled
-  // upon destruction. Every Observer getting that signal
-  // should see that it gets the updated new world
-  delete oldWorld;
-  return theWorld;
-}
+// Explicit instantiation of the singleton mechanism at this point
+
+CONSTRUCT_SINGLETON(World)
 
 /******************************* deprecated Legacy Stuff ***********************/