]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Compilation fix
authorMichal 'vorner' Vaner <michal.vaner@nic.cz>
Tue, 18 Oct 2011 10:35:16 +0000 (12:35 +0200)
committerMichal 'vorner' Vaner <michal.vaner@nic.cz>
Tue, 18 Oct 2011 10:35:16 +0000 (12:35 +0200)
The usual problem with EXPECT_EQ(NULL, ...), it doesn't like the type.

src/lib/dhcp/tests/option_unittest.cc

index 296022acb2268e0af3a920f9d14d29c1155269b7..49426aee8727ee21a47106c7d2abe73e7d54dfb9 100644 (file)
@@ -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(