Commit 7dff35a1 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

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

parent 40ae159a
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <boost/shared_ptr.hpp>
#include <set> #include <set>
#include <fstream> #include <fstream>
...@@ -36,7 +38,9 @@ using isc::datasrc::memory::ZoneTableSegment; ...@@ -36,7 +38,9 @@ using isc::datasrc::memory::ZoneTableSegment;
using isc::datasrc::memory::InMemoryZoneFinder; using isc::datasrc::memory::InMemoryZoneFinder;
using namespace isc::data; using namespace isc::data;
using namespace isc::dns; 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; using namespace std;
namespace { namespace {
...@@ -313,7 +317,7 @@ public: ...@@ -313,7 +317,7 @@ public:
result.life_keeper_); result.life_keeper_);
if (from_cache) { if (from_cache) {
EXPECT_NE(shared_ptr<InMemoryZoneFinder>(), EXPECT_NE(shared_ptr<InMemoryZoneFinder>(),
dynamic_pointer_cast<InMemoryZoneFinder>( boost::dynamic_pointer_cast<InMemoryZoneFinder>(
result.finder_)) << "Finder is not from cache"; result.finder_)) << "Finder is not from cache";
EXPECT_TRUE(NULL != EXPECT_TRUE(NULL !=
dynamic_cast<InMemoryClient*>(result.dsrc_client_)); dynamic_cast<InMemoryClient*>(result.dsrc_client_));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment