Changeset 10520 for code/branches/core7/src/libraries/network

Timestamp:

May 31, 2015, 11:54:06 AM (9 years ago)

Author:

landauf

Message:

StaticallyInitializedInstances are now responsible to delete the wrapped object.

Location:

code/branches/core7/src/libraries/network

Files:

• NetworkFunctionIncludes.h (modified) (1 diff)
• NetworkFunctionManager.cc (modified) (1 diff)
• NetworkFunctionManager.h (modified) (1 diff)

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

@@ -52 +52 @@
         public:
             StaticallyInitializedNetworkFunction(NetworkFunctionBase* function) : function_(function) {}
+            ~StaticallyInitializedNetworkFunction() { delete function_; }
 
             virtual void load();

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

@@ -54 +54 @@
     }
 
-    void NetworkFunctionManager::destroyAllNetworkFunctions()
-    {
-        std::set<NetworkFunctionBase*>::iterator it;
-        for (it = this->functions_.begin(); it != this->functions_.end(); ++it)
-            delete (*it);
-    }
-
     NetworkFunctionBase* NetworkFunctionManager::getFunctionByName(const std::string& name)
     {

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

@@ -46 +46 @@
             void unregisterFunction(NetworkFunctionBase* function);
 
-            void destroyAllNetworkFunctions();
-
             inline const std::set<NetworkFunctionBase*>& getAllFunctions()
                 { return functions_; }