[2381] Change more occurences of 0 to NULL

diff --git a/src/lib/util/tests/memory_segment_common_unittest.cc b/src/lib/util/tests/memory_segment_common_unittest.cc
index d47a3e25ac16f11314f72bf05aa6a119e1b10c44..3810e0a3f41bf07e3135dfa8c727ce24b6bcf049 100644 (file)
--- a/src/lib/util/tests/memory_segment_common_unittest.cc
+++ b/src/lib/util/tests/memory_segment_common_unittest.cc
@@ -64,7 +64,7 @@ checkSegmentNamedAddress(MemorySegment& segment, bool out_of_segment_ok) {
     EXPECT_FALSE(segment.clearNamedAddress("test address"));
 
     // Setting NULL is okay.
-    EXPECT_FALSE(segment.setNamedAddress("null address", 0));
+    EXPECT_FALSE(segment.setNamedAddress("null address", NULL));
     EXPECT_EQ(static_cast<void*>(NULL),
               segment.getNamedAddress("null address"));
 

diff --git a/src/lib/util/tests/memory_segment_mapped_unittest.cc b/src/lib/util/tests/memory_segment_mapped_unittest.cc
index b1e3ab5971cae411209c60bfbd826298ad64c652..9ab1e5cfe7cb310b3bba2b45be9b881c051cac25 100644 (file)
--- a/src/lib/util/tests/memory_segment_mapped_unittest.cc
+++ b/src/lib/util/tests/memory_segment_mapped_unittest.cc
@@ -89,7 +89,7 @@ TEST_F(MemorySegmentMappedTest, createAndModify) {
         EXPECT_TRUE(segment_->allMemoryDeallocated());
 
         void* ptr = segment_->allocate(1024);
-        EXPECT_NE(static_cast<void*>(0), ptr);
+        EXPECT_NE(static_cast<void*>(NULL), ptr);
 
         // Now, we have an allocation:
         EXPECT_FALSE(segment_->allMemoryDeallocated());