Changeset 10530 for code/branches/core7/src/libraries/core/Core.cc

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/Core.cc (modified) (4 diffs)

code/branches/core7/src/libraries/core/Core.cc

@@ -130 +130 @@
         // TODO: initialize NetworkFunctionManager here
         this->rootModule_ = ModuleInstance::getCurrentModuleInstance();
-        this->rootModule_->loadAllStaticallyInitializedInstances();
+        this->rootModule_->loadAllStaticallyInitializedInstances(0);
 
         // Parse command line arguments AFTER the modules have been loaded (static code!)
@@ -246 +246 @@
         if (this->rootModule_)
         {
-            this->rootModule_->unloadAllStaticallyInitializedInstances();
+            this->rootModule_->unloadAllStaticallyInitializedInstances(0);
             this->rootModule_->deleteAllStaticallyInitializedInstances();
         }
@@ -287 +287 @@
         DynLib* dynLib = this->dynLibManager_->load(module->getName());
         module->setDynLib(dynLib);
-        module->loadAllStaticallyInitializedInstances();
+        module->loadAllStaticallyInitializedInstances(0);
         IdentifierManager::getInstance().createClassHierarchy();
         ScopeManager::getInstance().updateListeners();
@@ -307 +307 @@
         orxout(internal_info) << "Unloading module " << module->getName() << "..." << endl;
 
-        module->unloadAllStaticallyInitializedInstances();
+        module->unloadAllStaticallyInitializedInstances(0);
         module->deleteAllStaticallyInitializedInstances();
         this->dynLibManager_->unload(module->getDynLib());