From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Tue, 18 Oct 2011 10:35:16 +0000 (+0200)
Subject: Compilation fix
X-Git-Tag: perftcpdns_before_epoll~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb49d74df87f9e87a7d14b16a3a84b31976a92fe;p=thirdparty%2Fkea.git

Compilation fix

The usual problem with EXPECT_EQ(NULL, ...), it doesn't like the type.
---

diff --git a/src/lib/dhcp/tests/option_unittest.cc b/src/lib/dhcp/tests/option_unittest.cc
index 296022acb2..49426aee87 100644
--- a/src/lib/dhcp/tests/option_unittest.cc
+++ b/src/lib/dhcp/tests/option_unittest.cc
@@ -40,7 +40,7 @@ TEST_F(OptionTest, basic4) {
     Option* opt = new Option(Option::V4, 17);
 
     EXPECT_EQ(17, opt->getType());
-    EXPECT_EQ(NULL, opt->getData());
+    EXPECT_EQ(static_cast<uint8_t*>(NULL), opt->getData());
     EXPECT_EQ(2, opt->len()); // just v4 header
 
     EXPECT_NO_THROW(
@@ -54,7 +54,7 @@ TEST_F(OptionTest, basic6) {
     Option* opt = new Option(Option::V6, 1);
 
     EXPECT_EQ(1, opt->getType());
-    EXPECT_EQ(NULL, opt->getData());
+    EXPECT_EQ(static_cast<uint8_t*>(NULL), opt->getData());
     EXPECT_EQ(4, opt->len()); // just v6 header
 
     EXPECT_NO_THROW(