From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Wed, 10 Oct 2012 18:42:46 +0000 (+0200)
Subject: Compilation fix: usual static_cast<X*>(NULL)
X-Git-Tag: trac2351_base~1^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65cddb545cbf31c0372ab09e59a727d7cfdf1f89;p=thirdparty%2Fkea.git

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.
---

diff --git a/src/lib/datasrc/tests/memory/zone_table_unittest.cc b/src/lib/datasrc/tests/memory/zone_table_unittest.cc
index 9cf1b3420c..401d43431b 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_);