BIND 10 master, updated. 76fa08f868a308d9b31c5bfd905aa4588867518d [master] explicit cast NULL in EXPECT_EQ; some compilers bare NULL.

BIND 10 source code commits bind10-changes at lists.isc.org
Sat Aug 25 05:11:35 UTC 2012


The branch, master has been updated
       via  76fa08f868a308d9b31c5bfd905aa4588867518d (commit)
      from  300c412c3f474b537a739fc38bd37a89cf35a78e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 76fa08f868a308d9b31c5bfd905aa4588867518d
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Sat Aug 25 05:10:34 2012 +0000

    [master] explicit cast NULL in EXPECT_EQ; some compilers bare NULL.
    
    this fixes build failure reported at:
    http://git.bind10.isc.org/~tester/builder//BIND10/20120825015000-Solaris10-sparc-Sunstudio/logs/build.out

-----------------------------------------------------------------------

Summary of changes:
 .../datasrc/memory/tests/zone_table_unittest.cc    |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/tests/zone_table_unittest.cc b/src/lib/datasrc/memory/tests/zone_table_unittest.cc
index 8078a9b..4f0af5e 100644
--- a/src/lib/datasrc/memory/tests/zone_table_unittest.cc
+++ b/src/lib/datasrc/memory/tests/zone_table_unittest.cc
@@ -123,7 +123,8 @@ TEST_F(ZoneTableTest, findZone) {
 
     EXPECT_EQ(result::NOTFOUND,
               zone_table->findZone(Name("example.org")).code);
-    EXPECT_EQ(NULL, zone_table->findZone(Name("example.org")).zone_data);
+    EXPECT_EQ(static_cast<ZoneData*>(NULL),
+              zone_table->findZone(Name("example.org")).zone_data);
 
     // there's no exact match.  the result should be the longest match,
     // and the code should be PARTIALMATCH.



More information about the bind10-changes mailing list