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

Timestamp:

May 31, 2015, 10:56:32 AM (9 years ago)

Author:

landauf

Message:

load modules AFTER core was initialized. load each module with a separate ModuleInstance. unloading is not yet implemented…

File:

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

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

@@ -32 +32 @@
 #include "core/CorePrereqs.h"
 
-#include <list>
+#include <set>
+#include <string>
 
 namespace orxonox
@@ -39 +40 @@
     {
         public:
+            ModuleInstance(const std::string& name);
             ~ModuleInstance();
 
@@ -45 +47 @@
             void unloadAllStaticallyInitializedInstances();
             void removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
+            void deleteAllStaticallyInitializedInstances();
+
+            inline const std::string& getName() const
+                { return this->name_; }
+
+            inline void setDynLib(DynLib* dynLib)
+                { this->dynLib_ = dynLib; }
+            inline DynLib* getDynLib() const
+                { return this->dynLib_; }
 
             static void setCurrentModuleInstance(ModuleInstance* instance);
@@ -50 +61 @@
 
         private:
-            std::list<StaticallyInitializedInstance*> staticallyInitializedInstances_;
+            std::set<StaticallyInitializedInstance*> staticallyInitializedInstances_;
+            std::string name_;
+            DynLib* dynLib_;
 
             static ModuleInstance* currentModuleInstance_s;