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

Timestamp:

Jun 6, 2015, 2:45:20 PM (9 years ago)

Author:

landauf

Message:

statically initialized instances may contain a type. currently not used.

File:

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

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

@@ -33 +33 @@
 
 #include <set>
+#include <map>
 #include <string>
+
+#include "StaticallyInitializedInstance.h"
 
 namespace orxonox
@@ -44 +47 @@
 
             void addStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
-            void loadAllStaticallyInitializedInstances();
-            void unloadAllStaticallyInitializedInstances();
             void removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
+
+            void loadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type);
+            void unloadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type);
+
             void deleteAllStaticallyInitializedInstances();
 
@@ -61 +66 @@
 
         private:
-            std::set<StaticallyInitializedInstance*> staticallyInitializedInstances_;
+            std::map<StaticallyInitializedInstance::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
             std::string name_;
             DynLib* dynLib_;