Changeset 11071 for code/trunk/test/core/class/OrxonoxInterfaceTest.cc

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• test/core/class/OrxonoxInterfaceTest.cc (modified) (3 diffs)

code/trunk/test/core/class/OrxonoxInterfaceTest.cc

@@ -31 +31 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     new IdentifierManager();
-                    Context::setRootContext(new Context(NULL));
+                    Context::setRootContext(new Context(nullptr));
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                     Context::destroyRootContext();
@@ -48 +48 @@
     {
         TestClass1* test = new TestClass1();
-        ASSERT_TRUE(test != NULL);
+        ASSERT_TRUE(test != nullptr);
         delete test;
     }
@@ -55 +55 @@
     {
         TestClass2* test = new TestClass2();
-        ASSERT_TRUE(test != NULL);
+        ASSERT_TRUE(test != nullptr);
         delete test;
     }