Changeset 11054 for code/branches/cpp11_v3/test/core/class/IdentifierClassHierarchyTest.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/IdentifierClassHierarchyTest.cc (modified) (5 diffs)

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

@@ -86 +86 @@
                 }
 
-                virtual void test1() {}
+                virtual void test1() override {}
         };
 
@@ -97 +97 @@
                 }
 
-                virtual void test1() {}
-                virtual void test2() {}
+                virtual void test1() override {}
+                virtual void test2() override {}
         };
 
@@ -109 +109 @@
                 }
 
-                virtual void test1() {}
-                virtual void test2() {}
+                virtual void test1() override {}
+                virtual void test2() override {}
         };
 
@@ -121 +121 @@
                 }
 
-                virtual void test1() {}
-                virtual void test2() {}
+                virtual void test1() override {}
+                virtual void test2() override {}
         };
 
@@ -140 +140 @@
         {
             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();