Changeset 10768 for code/branches/cpp11_v2/test/util

Timestamp:

Nov 6, 2015, 10:54:34 PM (9 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/test/util

Files:

• SharedPtrTest.cc (modified) (4 diffs)
• SmallObjectAllocatorTest.cc (modified) (4 diffs)

code/branches/cpp11_v2/test/util/SharedPtrTest.cc

@@ -41 +41 @@
     {
         SharedPtr<TestClass> test;
-        EXPECT_EQ(0, test.get());
+        EXPECT_EQ(nullptr, test.get());
     }
 
@@ -91 +91 @@
 
         SharedPtr<TestClass> test;
-        EXPECT_EQ(0, test.get());
+        EXPECT_EQ(nullptr, test.get());
 
         test = other;
@@ -105 +105 @@
 
         SharedPtr<TestClass> test;
-        EXPECT_EQ(0, test.get());
+        EXPECT_EQ(nullptr, test.get());
 
         test = other;
@@ -138 +138 @@
     {
         SharedPtr<TestClass> test;
-        EXPECT_EQ(0, test.get());
+        EXPECT_EQ(nullptr, test.get());
         EXPECT_FALSE(test);
 

code/branches/cpp11_v2/test/util/SmallObjectAllocatorTest.cc

@@ -47 +47 @@
         // create an integer
         size_t* pointer = this->create(5);
-        ASSERT_NE((void*)0, pointer);
+        ASSERT_NE((void*)nullptr, pointer);
         EXPECT_EQ(5u, *pointer);
     }
@@ -55 +55 @@
         // create an integer
         size_t* pointer = this->create(5);
-        ASSERT_NE((void*)0, pointer);
+        ASSERT_NE((void*)nullptr, pointer);
         EXPECT_EQ(5u, *pointer);
 
@@ -228 +228 @@
         // create an object
         SmallObject* pointer = this->create(5);
-        ASSERT_NE((void*)0, pointer);
+        ASSERT_NE((void*)nullptr, pointer);
         EXPECT_EQ(5u, pointer->getValue());
         EXPECT_EQ(5u, SmallObject::total_s);
@@ -239 +239 @@
         // create an object
         SmallObject* pointer = this->create(5);
-        ASSERT_NE((void*)0, pointer);
+        ASSERT_NE((void*)nullptr, pointer);
         EXPECT_EQ(5u, pointer->getValue());
         EXPECT_EQ(5u, SmallObject::total_s);