Changeset 10535 for code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc

Timestamp:

Jun 6, 2015, 11:52:25 PM (10 years ago)

Author:

landauf

Message:

statically initialized instances are now registered with a type. CoreStaticInitializationHandler initializes all instances in core, NetworkStaticInitializationHandler initializes all instances in network.

File:

• code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified) (2 diffs)

code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc

@@ -109 +109 @@
                 virtual void SetUp()
                 {
-                    ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(0);
+                    ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
                     Identifier::initConfigValues_s = false; // TODO: hack!
                     IdentifierManager::getInstance().createClassHierarchy();
@@ -117 +117 @@
                 {
                     IdentifierManager::getInstance().destroyClassHierarchy();
-                    ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(0);
+                    ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
                 }
         };