Changeset 10518 for code/branches/core7/src/libraries/core/class

Timestamp:

May 31, 2015, 10:56:32 AM (10 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/class/IdentifierManager.cc (modified) (2 diffs)

code/branches/core7/src/libraries/core/class/IdentifierManager.cc

@@ -100 +100 @@
             {
                 Identifier* identifier = (*it);
+                if (identifier->isInitialized())
+                    continue;
 
                 orxout(verbose, context::identifier) << "Initialize ClassIdentifier<" << identifier->getName() << ">-Singleton." << endl;
@@ -135 +137 @@
             if (initializedIdentifiers.find(identifier) != initializedIdentifiers.end())
                 identifier->finishInitialization();
-            else
+            else if (!identifier->isInitialized())
                 orxout(internal_error) << "Identifier was registered late and is not initialized: " << identifier->getName() << " / " << identifier->getTypeInfo().name() << endl;
         }