BIND 10 master, updated. 041dbf514a284b9c14f3a803dbaa8e4260b804f2 Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  041dbf514a284b9c14f3a803dbaa8e4260b804f2 (commit)
       via  7dff35a176bcf41d83a14eb5b3fbca6a7dcfafb8 (commit)
      from  0187917d0b77b34997c4666d27f916cd8f6b4dd4 (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 041dbf514a284b9c14f3a803dbaa8e4260b804f2
Merge: 7dff35a 0187917
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Oct 29 19:54:02 2012 +0000

    Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 7dff35a176bcf41d83a14eb5b3fbca6a7dcfafb8
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Oct 29 19:53:19 2012 +0000

    [master] avoid 'using namespace boost' due to definition conflicts

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

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

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index be593fe..d1ff852 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -27,6 +27,8 @@
 
 #include <gtest/gtest.h>
 
+#include <boost/shared_ptr.hpp>
+
 #include <set>
 #include <fstream>
 
@@ -36,7 +38,9 @@ using isc::datasrc::memory::ZoneTableSegment;
 using isc::datasrc::memory::InMemoryZoneFinder;
 using namespace isc::data;
 using namespace isc::dns;
-using namespace boost;
+// don't import the entire boost namespace.  It will unexpectedly hide uintXX_t
+// for some systems.
+using boost::shared_ptr;
 using namespace std;
 
 namespace {
@@ -313,7 +317,7 @@ public:
                   result.life_keeper_);
         if (from_cache) {
             EXPECT_NE(shared_ptr<InMemoryZoneFinder>(),
-                      dynamic_pointer_cast<InMemoryZoneFinder>(
+                      boost::dynamic_pointer_cast<InMemoryZoneFinder>(
                           result.finder_)) << "Finder is not from cache";
             EXPECT_TRUE(NULL !=
                         dynamic_cast<InMemoryClient*>(result.dsrc_client_));