Changes in src/Actions/ActionRegistry.cpp [d56640:cf1a07]

File:

• src/Actions/ActionRegistry.cpp (modified) (3 diffs)

src/Actions/ActionRegistry.cpp

@@ -9 +9 @@
 #include "Actions/Action.hpp"
 
-#include "Patterns/Singleton_impl.hpp"
-
 #include <string>
-#include "Helpers/Assert.hpp"
+#include <cassert>
 #include <iostream>
 
 using namespace std;
+
+ActionRegistry *ActionRegistry::theInstance=0;
 
 ActionRegistry::ActionRegistry()
@@ -33 +33 @@
   map<const string,Action*>::iterator iter;
   iter = actionMap.find(name);
-  ASSERT(iter!=actionMap.end(),"Query for an action not stored in registry");
+  assert(iter!=actionMap.end() && "Query for an action not stored in registry");
   return iter->second;
 }
@@ -40 +40 @@
   pair<map<const string,Action*>::iterator,bool> ret;
   ret = actionMap.insert(pair<const string,Action*>(action->getName(),action));
-  ASSERT(ret.second,"Two actions with the same name added to registry");
+  assert(ret.second && "Two actions with the same name added to registry");
 }
 
-CONSTRUCT_SINGLETON(ActionRegistry)
+// singleton stuff
+ActionRegistry* ActionRegistry::getRegistry(){
+  if(!theInstance){
+    theInstance = new ActionRegistry();
+  }
+  return theInstance;
+}
+
+void ActionRegistry::purgeRegistry(){
+  if(theInstance){
+    delete theInstance;
+    theInstance = 0;
+  }
+}