Changeset 11054 for code/branches/cpp11_v3/test/core/class/IdentifierSimpleClassHierarchyTest.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• test/core/class/IdentifierSimpleClassHierarchyTest.cc (modified) (2 diffs)

code/branches/cpp11_v3/test/core/class/IdentifierSimpleClassHierarchyTest.cc

@@ -38 +38 @@
                 }
 
-                virtual void test() {}
+                virtual void test() override {}
         };
 
@@ -49 +49 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     new IdentifierManager();
                     ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
-                    Context::setRootContext(new Context(NULL));
+                    Context::setRootContext(new Context(nullptr));
                     Identifier::initConfigValues_s = false; // TODO: hack!
                     IdentifierManager::getInstance().createClassHierarchy();
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                     IdentifierManager::getInstance().destroyClassHierarchy();