[Orxonox-commit 5862] r10522 - code/branches/core7/src/libraries/core/module

[landauf at orxonox.net]

Author: landauf
Date: 2015-05-31 14:24:07 +0200 (Sun, 31 May 2015)
New Revision: 10522

Modified:
   code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc
   code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h
Log:
remove StaticallyInitializedInstance from the same module where it was added

Modified: code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc
===================================================================
--- code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc	2015-05-31 11:41:55 UTC (rev 10521)
+++ code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc	2015-05-31 12:24:07 UTC (rev 10522)
@@ -34,11 +34,12 @@
 {
     StaticallyInitializedInstance::StaticallyInitializedInstance()
     {
-        ModuleInstance::getCurrentModuleInstance()->addStaticallyInitializedInstance(this);
+        this->module_ = ModuleInstance::getCurrentModuleInstance();
+        this->module_->addStaticallyInitializedInstance(this);
     }
 
     StaticallyInitializedInstance::~StaticallyInitializedInstance()
     {
-        ModuleInstance::getCurrentModuleInstance()->removeStaticallyInitializedInstance(this);
+        this->module_->removeStaticallyInitializedInstance(this);
     }
 }

Modified: code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h
===================================================================
--- code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h	2015-05-31 11:41:55 UTC (rev 10521)
+++ code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h	2015-05-31 12:24:07 UTC (rev 10522)
@@ -41,6 +41,9 @@
 
             virtual void load() = 0;
             virtual void unload() = 0;
+
+        private:
+            ModuleInstance* module_;
     };
 }