Changeset 10765 for code/branches/cpp11_v2/test/core/object/StrongPtrTest.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/StrongPtrTest.cc (modified) (5 diffs)

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

@@ -111 +111 @@
     void isNull(const StrongPtr<DestroyableTest> strongPtr)
     {
-        EXPECT_TRUE(strongPtr == NULL);
+        EXPECT_TRUE(strongPtr == nullptr);
         EXPECT_TRUE(strongPtr == 0);
         EXPECT_TRUE(!strongPtr);
-        EXPECT_FALSE(strongPtr != NULL);
+        EXPECT_FALSE(strongPtr != nullptr);
         EXPECT_FALSE(strongPtr != 0);
         EXPECT_FALSE(strongPtr);
@@ -126 +126 @@
         }
         {
-            StrongPtr<DestroyableTest> strongPtr = NULL;
+            StrongPtr<DestroyableTest> strongPtr = nullptr;
             isNull(strongPtr);
         }
         {
             StrongPtr<DestroyableTest> strongPtr;
-            strongPtr = NULL;
+            strongPtr = nullptr;
             isNull(strongPtr);
         }
@@ -150 +150 @@
         DestroyableTest* test = new DestroyableTest(destroyed);
         StrongPtr<DestroyableTest> strongPtr = test;
-        EXPECT_FALSE(strongPtr == NULL);
+        EXPECT_FALSE(strongPtr == nullptr);
         EXPECT_FALSE(strongPtr == 0);
         EXPECT_FALSE(!strongPtr);
-        EXPECT_TRUE(strongPtr != NULL);
+        EXPECT_TRUE(strongPtr != nullptr);
         EXPECT_TRUE(strongPtr != 0);
         EXPECT_TRUE(strongPtr);
@@ -166 +166 @@
         // default
         StrongPtr<DestroyableTest> strongPtr1;
-        EXPECT_EQ(NULL, strongPtr1.get());
+        EXPECT_EQ(nullptr, strongPtr1.get());
 
         // pointer
@@ -277 +277 @@
         EXPECT_EQ(1u, test->getReferenceCount());
         strongPtr.reset();
-        EXPECT_EQ(NULL, strongPtr.get());
+        EXPECT_EQ(nullptr, strongPtr.get());
         EXPECT_EQ(0u, test->getReferenceCount());