BIND 10 master, updated. 0684f354d89fda12a3146050a55eacbb0a8c5071 [2046] Fix compilation of tests on Solaris

[BIND 10 source code commits]

The branch, master has been updated
       via  0684f354d89fda12a3146050a55eacbb0a8c5071 (commit)
      from  6b80e1e57145e8b0796d872f51ca39a0f4bbc17a (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 0684f354d89fda12a3146050a55eacbb0a8c5071
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Jul 11 13:59:24 2012 +0200

    [2046] Fix compilation of tests on Solaris
    
    It considers NULL to be int and gets confused when instantiating
    templates of the GTEST library.

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

Summary of changes:
 src/lib/datasrc/tests/client_list_unittest.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index 8625d33..6036aca 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -735,7 +735,8 @@ TEST_F(ListTest, masterFiles) {
     list_->configure(*elem, true);
 
     // It has only the cache
-    EXPECT_EQ(NULL, list_->getDataSources()[0].data_src_client_);
+    EXPECT_EQ(static_cast<const DataSourceClient*>(NULL),
+              list_->getDataSources()[0].data_src_client_);
 
     // And it can search
     positiveResult(list_->find(Name(".")), ds_[0], Name("."), true, "com",