Changeset 10522

Timestamp:

May 31, 2015, 2:24:07 PM (9 years ago)

Author:

landauf

Message:

remove StaticallyInitializedInstance from the same module where it was added

Location:

code/branches/core7/src/libraries/core/module

Files:

• StaticallyInitializedInstance.cc (modified) (1 diff)
• StaticallyInitializedInstance.h (modified) (1 diff)

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

@@ -35 +35 @@
     StaticallyInitializedInstance::StaticallyInitializedInstance()
     {
-        ModuleInstance::getCurrentModuleInstance()->addStaticallyInitializedInstance(this);
+        this->module_ = ModuleInstance::getCurrentModuleInstance();
+        this->module_->addStaticallyInitializedInstance(this);
     }
 
     StaticallyInitializedInstance::~StaticallyInitializedInstance()
     {
-        ModuleInstance::getCurrentModuleInstance()->removeStaticallyInitializedInstance(this);
+        this->module_->removeStaticallyInitializedInstance(this);
     }
 }

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

@@ -42 +42 @@
             virtual void load() = 0;
             virtual void unload() = 0;
+
+        private:
+            ModuleInstance* module_;
     };
 }