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

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

@@ -20 +20 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     new IdentifierManager();
@@ -26 +26 @@
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                     ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
@@ -37 +37 @@
     {
         IdentifiableClass* test = new IdentifiableClass();
-        ASSERT_TRUE(test != NULL);
+        ASSERT_TRUE(test != nullptr);
         delete test;
     }