[1803] Fix compile errors in some unit tests

diff --git a/src/lib/datasrc/tests/rbtree_unittest.cc b/src/lib/datasrc/tests/rbtree_unittest.cc
index f7f59e4fec5d0e5d7ba056c201376f0a038cad9a..4ef6b14d40c04f73cdde03a54abcd9f49bc8cd08 100644 (file)
--- a/src/lib/datasrc/tests/rbtree_unittest.cc
+++ b/src/lib/datasrc/tests/rbtree_unittest.cc
@@ -448,7 +448,7 @@ TEST_F(RBTreeTest, previousNode) {
                   rbtree.find<void*>(Name(names[0]), &node, node_path, NULL,
                                      NULL));
         EXPECT_NE(static_cast<void*>(NULL), node);
-        EXPECT_EQ(NULL, rbtree.previousNode(node_path));
+        EXPECT_EQ(static_cast<void*>(NULL), rbtree.previousNode(node_path));
         node = NULL;
         node_path.clear();
     }
@@ -458,8 +458,8 @@ TEST_F(RBTreeTest, previousNode) {
         // If we start before the lowest (0 < a), we should not get a node nor
         EXPECT_EQ(RBTree<int>::NOTFOUND,
                   rbtree.find<void*>(Name("0"), &node, node_path, NULL, NULL));
-        EXPECT_EQ(NULL, node);
-        EXPECT_EQ(NULL, rbtree.previousNode(node_path));
+        EXPECT_EQ(static_cast<void*>(NULL), node);
+        EXPECT_EQ(static_cast<void*>(NULL), rbtree.previousNode(node_path));
         node = NULL;
         node_path.clear();
     }