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

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

@@ -27 +27 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     new IdentifierManager();
@@ -33 +33 @@
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                     ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
@@ -46 +46 @@
 
         Identifier* identifier = Class(TestClass);
-        EXPECT_TRUE(identifier != NULL);
+        EXPECT_TRUE(identifier != nullptr);
     }
 
@@ -54 +54 @@
 
         Identifier* identifier = Class(TestSubclass);
-        EXPECT_TRUE(identifier != NULL);
+        EXPECT_TRUE(identifier != nullptr);
     }