Changeset 10765 for code/branches/cpp11_v2/test/core/object/ContextTest.cc

Timestamp:

Nov 4, 2015, 10:25:42 PM (9 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

File:

• code/branches/cpp11_v2/test/core/object/ContextTest.cc (modified) (6 diffs)

code/branches/cpp11_v2/test/core/object/ContextTest.cc

@@ -12 +12 @@
         {
             public:
-                SubclassContext() : Context(NULL) { RegisterObject(SubclassContext); }
+                SubclassContext() : Context(nullptr) { RegisterObject(SubclassContext); }
         };
 
@@ -25 +25 @@
                     new IdentifierManager();
                     ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
-                    Context::setRootContext(new Context(NULL));
+                    Context::setRootContext(new Context(nullptr));
                 }
 
@@ -39 +39 @@
     TEST_F(ContextTest, CanCreateContext)
     {
-        Context context(NULL);
+        Context context(nullptr);
     }
 
@@ -49 +49 @@
     TEST_F(ContextTest, ContextIsItsOwnContext)
     {
-        Context context(NULL);
+        Context context(nullptr);
         EXPECT_EQ(&context, context.getContext());
     }
@@ -68 +68 @@
     TEST_F(ContextTest, ContextIsAddedToItsOwnObjectList)
     {
-        Context context(NULL);
+        Context context(nullptr);
         ASSERT_EQ(1u, context.getObjectList<Context>()->size());
         EXPECT_TRUE(context.getObjectList<Context>()->begin()->objectBase_ == static_cast<Listable*>(&context));
@@ -75 +75 @@
     TEST_F(ContextTest, ContextIsAddedToObjectListOfBaseContext)
     {
-        Context baseContext(NULL);
+        Context baseContext(nullptr);
         Context subContext(&baseContext);