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

Timestamp:

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

Author:

landauf

Message:

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

File:

• code/branches/core7/src/libraries/network/NetworkFunctionManager.h (modified) (1 diff)

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

@@ -42 +42 @@
             static NetworkFunctionManager& getInstance();
 
-            static void setNetworkID(const std::string& name, uint32_t id);
-            static void destroyAllNetworkFunctions();
-            static std::map<std::string, NetworkFunctionBase*>& getNameMap();
+            void setNetworkID(const std::string& name, uint32_t id);
+            void destroyAllNetworkFunctions();
 
-            static inline std::map<NetworkFunctionPointer, NetworkFunctionBase*>& getFunctorMap()
+            inline std::map<std::string, NetworkFunctionBase*>& getNameMap()
+                { return nameMap_; }
+            inline std::map<NetworkFunctionPointer, NetworkFunctionBase*>& getFunctorMap()
                 { return functorMap_; }
-            static inline std::map<uint32_t, NetworkFunctionBase*>& getIdMap()
+            inline std::map<uint32_t, NetworkFunctionBase*>& getIdMap()
                 { return idMap_; }
 
-            static NetworkFunctionBase* getFunction(const NetworkFunctionPointer& p);
-            static NetworkFunctionBase* getFunction(uint32_t id);
+            NetworkFunctionBase* getFunction(const NetworkFunctionPointer& p);
+            NetworkFunctionBase* getFunction(uint32_t id);
 
         private:
-            static std::map<NetworkFunctionPointer, NetworkFunctionBase*> functorMap_;
-            static std::map<uint32_t, NetworkFunctionBase*> idMap_;
+            std::map<std::string, NetworkFunctionBase*> nameMap_;
+            std::map<NetworkFunctionPointer, NetworkFunctionBase*> functorMap_;
+            std::map<uint32_t, NetworkFunctionBase*> idMap_;
     };
 }