Changeset 10474 for code/branches/core7/src/libraries/network/NetworkFunctionManager.cc

Timestamp:

May 25, 2015, 2:14:16 PM (10 years ago)

Author:

landauf

Message:

made NetworkFunctionManager a singleton, no static functions anymore (except for getInstance)

File:

• code/branches/core7/src/libraries/network/NetworkFunctionManager.cc (modified) (4 diffs)

code/branches/core7/src/libraries/network/NetworkFunctionManager.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    std::map<NetworkFunctionPointer, NetworkFunctionBase*> NetworkFunctionManager::functorMap_;
-    std::map<uint32_t, NetworkFunctionBase*> NetworkFunctionManager::idMap_;
-
     /* static */NetworkFunctionManager& NetworkFunctionManager::getInstance()
     {
@@ -41 +38 @@
     }
 
-    /*static*/void NetworkFunctionManager::setNetworkID(const std::string& name, uint32_t id)
+    void NetworkFunctionManager::setNetworkID(const std::string& name, uint32_t id)
     {
-        std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionManager::getNameMap();
+        std::map<std::string, NetworkFunctionBase*>& map = this->nameMap_;
         assert( map.find(name)!=map.end() );
         map[name]->setNetworkID(id);
     }
 
-    /*static*/void NetworkFunctionManager::destroyAllNetworkFunctions()
+    void NetworkFunctionManager::destroyAllNetworkFunctions()
     {
-        std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionManager::getNameMap();
+        std::map<std::string, NetworkFunctionBase*>& map = this->nameMap_;
         std::map<std::string, NetworkFunctionBase*>::iterator it;
         for (it = map.begin(); it != map.end(); ++it)
@@ -56 +53 @@
     }
 
-    /*static*/std::map<std::string, NetworkFunctionBase*>& NetworkFunctionManager::getNameMap()
-    {
-        static std::map<std::string, NetworkFunctionBase*> nameMap_;
-        return nameMap_;
-    }
-
-    /*static*/NetworkFunctionBase* NetworkFunctionManager::getFunction(const NetworkFunctionPointer& p)
+    NetworkFunctionBase* NetworkFunctionManager::getFunction(const NetworkFunctionPointer& p)
     {
         std::map<NetworkFunctionPointer, NetworkFunctionBase*>::iterator it = functorMap_.find(p);
@@ -69 +60 @@
     }
 
-    /*static*/NetworkFunctionBase* NetworkFunctionManager::getFunction(uint32_t id)
+    NetworkFunctionBase* NetworkFunctionManager::getFunction(uint32_t id)
     {
         std::map<uint32_t, NetworkFunctionBase*>::iterator it = idMap_.find(id);