Changeset 10344 for code/branches/core7/src/libraries/core/module/ModuleInstance.cc

Timestamp:

Apr 5, 2015, 5:29:21 PM (9 years ago)

Author:

landauf

Message:

remove and destroy StaticallyInitializedInstances

File:

• code/branches/core7/src/libraries/core/module/ModuleInstance.cc (modified) (2 diffs)

code/branches/core7/src/libraries/core/module/ModuleInstance.cc

@@ -35 +35 @@
     ModuleInstance* ModuleInstance::currentModuleInstance_s = NULL;
 
+    ModuleInstance::~ModuleInstance()
+    {
+        std::list<StaticallyInitializedInstance*> copy(this->staticallyInitializedInstances_);
+        for (std::list<StaticallyInitializedInstance*>::iterator it = this->staticallyInitializedInstances_.begin(); it != this->staticallyInitializedInstances_.end(); ++it)
+            delete (*it);
+    }
+
     void ModuleInstance::addStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
     {
@@ -42 +49 @@
     void ModuleInstance::loadAllStaticallyInitializedInstances()
     {
-        for (size_t i = 0; i < this->staticallyInitializedInstances_.size(); ++i)
-            this->staticallyInitializedInstances_[i]->load();
+        for (std::list<StaticallyInitializedInstance*>::iterator it = this->staticallyInitializedInstances_.begin(); it != this->staticallyInitializedInstances_.end(); ++it)
+            (*it)->load();
+    }
+
+    void ModuleInstance::removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
+    {
+        this->staticallyInitializedInstances_.remove(instance);
     }