[svn] commit: r2040 - /trunk/src/lib/datasrc/tests/sqlite3_unittest.cc

[BIND 10 source code commits]

Author: jinmei
Date: Wed Jun  2 05:51:21 2010
New Revision: 2040

Log:
cast NULL to deal with some type of compilers

Modified:
    trunk/src/lib/datasrc/tests/sqlite3_unittest.cc

Modified: trunk/src/lib/datasrc/tests/sqlite3_unittest.cc
==============================================================================
--- trunk/src/lib/datasrc/tests/sqlite3_unittest.cc (original)
+++ trunk/src/lib/datasrc/tests/sqlite3_unittest.cc Wed Jun  2 05:51:21 2010
@@ -376,8 +376,8 @@
 
     NameMatch name_match(www_name);
     data_source.findClosestEnclosure(name_match, rrclass);
-    EXPECT_EQ(NULL, name_match.closestName());
-    EXPECT_EQ(NULL, name_match.bestDataSrc());
+    EXPECT_EQ(static_cast<void*>(NULL), name_match.closestName());
+    EXPECT_EQ(static_cast<void*>(NULL), name_match.bestDataSrc());
 }
 
 TEST_F(Sqlite3DataSourceTest, openFail) {
@@ -441,15 +441,15 @@
 TEST_F(Sqlite3DataSourceTest, findClosestEnclosureNoMatch) {
     NameMatch name_match(nomatch_name);
     data_source.findClosestEnclosure(name_match, rrclass);
-    EXPECT_EQ(NULL, name_match.closestName());
-    EXPECT_EQ(NULL, name_match.bestDataSrc());
+    EXPECT_EQ(static_cast<void*>(NULL), name_match.closestName());
+    EXPECT_EQ(static_cast<void*>(NULL), name_match.bestDataSrc());
 }
 
 TEST_F(Sqlite3DataSourceTest, findClosestClassMismatch) {
     NameMatch name_match(www_name);
     data_source.findClosestEnclosure(name_match, rrclass_notmatch);
-    EXPECT_EQ(NULL, name_match.closestName());
-    EXPECT_EQ(NULL, name_match.bestDataSrc());
+    EXPECT_EQ(static_cast<void*>(NULL), name_match.closestName());
+    EXPECT_EQ(static_cast<void*>(NULL), name_match.bestDataSrc());
 }
 
 // If the query class is ANY, the result should be the same as the case where