BIND 10 master, updated. fb49d74df87f9e87a7d14b16a3a84b31976a92fe Compilation fix

[BIND 10 source code commits]

The branch, master has been updated
       via  fb49d74df87f9e87a7d14b16a3a84b31976a92fe (commit)
      from  1817f1e8fd4a3635b8b5e0d581f6a2aa61b5e955 (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 fb49d74df87f9e87a7d14b16a3a84b31976a92fe
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Oct 18 12:35:16 2011 +0200

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

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

Summary of changes:
 src/lib/dhcp/tests/option_unittest.cc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/tests/option_unittest.cc b/src/lib/dhcp/tests/option_unittest.cc
index 296022a..49426ae 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(