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

Timestamp:

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

Author:

landauf

Message:

remove and destroy StaticallyInitializedInstances

File:

• code/branches/core7/src/libraries/core/module/ModuleInstance.h (modified) (3 diffs)

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

@@ -32 +32 @@
 #include "core/CorePrereqs.h"
 
-#include <vector>
+#include <list>
 
 namespace orxonox
@@ -39 +39 @@
     {
         public:
+            ~ModuleInstance();
+
             void addStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
             void loadAllStaticallyInitializedInstances();
+            void removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
 
             static void setCurrentModuleInstance(ModuleInstance* instance);
@@ -46 +49 @@
 
         private:
-            std::vector<StaticallyInitializedInstance*> staticallyInitializedInstances_;
+            std::list<StaticallyInitializedInstance*> staticallyInitializedInstances_;
 
             static ModuleInstance* currentModuleInstance_s;