BIND 10 master, updated. 65cddb545cbf31c0372ab09e59a727d7cfdf1f89 Compilation fix: usual static_cast<X*>(NULL)

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Oct 10 18:45:39 UTC 2012


The branch, master has been updated
       via  65cddb545cbf31c0372ab09e59a727d7cfdf1f89 (commit)
      from  99fd73694c6768e36d79563be991d9132adbdd74 (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 65cddb545cbf31c0372ab09e59a727d7cfdf1f89
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Oct 10 20:42:46 2012 +0200

    Compilation fix: usual static_cast<X*>(NULL)
    
    Sunstudio is unhappy with plain NULL inside EXPECT_EQ and thinks it is
    int. This makes it think otherwise.

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

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

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/memory/zone_table_unittest.cc b/src/lib/datasrc/tests/memory/zone_table_unittest.cc
index 9cf1b34..401d434 100644
--- a/src/lib/datasrc/tests/memory/zone_table_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_table_unittest.cc
@@ -101,9 +101,9 @@ TEST_F(ZoneTableTest, addZone) {
                                                            zname1,
                                                            holder1.release()));
     EXPECT_EQ(result::SUCCESS, result1.code);
-    EXPECT_EQ(NULL, result1.zone_data);
+    EXPECT_EQ(static_cast<const ZoneData*>(NULL), result1.zone_data);
     // It got released by it
-    EXPECT_EQ(NULL, holder1.get());
+    EXPECT_EQ(static_cast<const ZoneData*>(NULL), holder1.get());
 
     // Duplicate add doesn't replace the existing data.
     SegmentObjectHolder<ZoneData, RRClass> holder2(
@@ -115,7 +115,7 @@ TEST_F(ZoneTableTest, addZone) {
     // The old one gets out
     EXPECT_EQ(data1, result2.zone_data);
     // It releases this one even when we replace the old zone
-    EXPECT_EQ(NULL, holder2.get());
+    EXPECT_EQ(static_cast<const ZoneData*>(NULL), holder2.get());
     // We need to release the old one manually
     ZoneData::destroy(mem_sgmt_, result2.zone_data, zclass_);
 



More information about the bind10-changes mailing list