[svn] commit: r2403 - in /trunk/src/lib/datasrc/tests: sqlite3_unittest.cc static_unittest.cc

[BIND 10 source code commits]

Author: each
Date: Fri Jul  2 01:50:34 2010
New Revision: 2403

Log:
More static_casts of NULL for NetBSD.

Modified:
    trunk/src/lib/datasrc/tests/sqlite3_unittest.cc
    trunk/src/lib/datasrc/tests/static_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 Fri Jul  2 01:50:34 2010
@@ -376,8 +376,8 @@
 
     DataSrcMatch match(www_name, rrclass);
     data_source.findClosestEnclosure(match);
-    EXPECT_EQ(NULL, match.getEnclosingZone());
-    EXPECT_EQ(NULL, match.getDataSource());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getEnclosingZone());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getDataSource());
 }
 
 TEST_F(Sqlite3DataSourceTest, openFail) {
@@ -441,15 +441,15 @@
 TEST_F(Sqlite3DataSourceTest, findClosestEnclosureNoMatch) {
     DataSrcMatch match(nomatch_name, rrclass);
     data_source.findClosestEnclosure(match);
-    EXPECT_EQ(NULL, match.getEnclosingZone());
-    EXPECT_EQ(NULL, match.getDataSource());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getEnclosingZone());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getDataSource());
 }
 
 TEST_F(Sqlite3DataSourceTest, findClosestClassMismatch) {
     DataSrcMatch match(nomatch_name, rrclass);
     data_source.findClosestEnclosure(match);
-    EXPECT_EQ(NULL, match.getEnclosingZone());
-    EXPECT_EQ(NULL, match.getDataSource());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getEnclosingZone());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getDataSource());
 }
 
 // If the query class is ANY, the result should be the same as the case where

Modified: trunk/src/lib/datasrc/tests/static_unittest.cc
==============================================================================
--- trunk/src/lib/datasrc/tests/static_unittest.cc (original)
+++ trunk/src/lib/datasrc/tests/static_unittest.cc Fri Jul  2 01:50:34 2010
@@ -214,8 +214,8 @@
 TEST_F(StaticDataSourceTest, findClosestEnclosureForVersionClassMismatch) {
     DataSrcMatch match(version_name, RRClass::IN());
     data_source.findClosestEnclosure(match);
-    EXPECT_EQ(NULL, match.getEnclosingZone());
-    EXPECT_EQ(NULL, match.getDataSource());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getEnclosingZone());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getDataSource());
 }
 
 TEST_F(StaticDataSourceTest, findClosestEnclosureForVersionPartial) {
@@ -242,8 +242,8 @@
 TEST_F(StaticDataSourceTest, findClosestEnclosureNoMatch) {
     DataSrcMatch match(nomatch_name, rrclass);
     data_source.findClosestEnclosure(match);
-    EXPECT_EQ(NULL, match.getEnclosingZone());
-    EXPECT_EQ(NULL, match.getDataSource());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getEnclosingZone());
+    EXPECT_EQ(static_cast<void*>(NULL), match.getDataSource());
 }
 
 TEST_F(StaticDataSourceTest, findRRsetVersionTXT) {