From: Jeremy C. Reed <jreed@ISC.org>
Date: Wed, 25 Jul 2012 12:49:12 +0000 (-0500)
Subject: [master] fix errors with ambiguous types and other boost uses
X-Git-Tag: trac2351_base~97^2~7^2~2^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=438f31e7886d2e280fa4a35c8e06a3b0d3c2b9e0;p=thirdparty%2Fkea.git

[master] fix errors with ambiguous types and other boost uses

Stop doing "using namespace boost" and be specific with the using boost::.

Problem noticed on Solaris 11 with g++ 4.5.2 and boost 1.50.0.
Tested with older g++ 4.1.3 with boost 1.42.0 (on NetBSD).

Discussed little on jabber.
---

diff --git a/src/lib/cryptolink/tests/crypto_unittests.cc b/src/lib/cryptolink/tests/crypto_unittests.cc
index df94c1283b..c8fe9c6d81 100644
--- a/src/lib/cryptolink/tests/crypto_unittests.cc
+++ b/src/lib/cryptolink/tests/crypto_unittests.cc
@@ -31,7 +31,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::util;
 using namespace isc::util::encode;
 using namespace isc::cryptolink;
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index 38ab5cca43..a50a752d18 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -24,7 +24,9 @@
 using namespace isc::data;
 using namespace isc::dns;
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 namespace isc {
 namespace datasrc {
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index a8ba55e7fa..82a5e54d65 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -38,7 +38,8 @@
 using namespace isc::dns;
 using namespace std;
 using namespace isc::dns::rdata;
-using namespace boost;
+using boost::lexical_cast;
+using boost::scoped_ptr;
 
 namespace isc {
 namespace datasrc {
diff --git a/src/lib/dns/edns.cc b/src/lib/dns/edns.cc
index 447b47986d..e2a20edd59 100644
--- a/src/lib/dns/edns.cc
+++ b/src/lib/dns/edns.cc
@@ -34,7 +34,7 @@
 #include <dns/rrtype.h>
 
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::dns::rdata;
 using namespace isc::util;
 
diff --git a/src/lib/dns/message.cc b/src/lib/dns/message.cc
index 0a1625a206..80b0df77df 100644
--- a/src/lib/dns/message.cc
+++ b/src/lib/dns/message.cc
@@ -44,7 +44,7 @@
 #include <dns/tsig.h>
 
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::dns::rdata;
 using namespace isc::util;
 
diff --git a/src/lib/dns/rdata.cc b/src/lib/dns/rdata.cc
index 59a58871b8..c7eaa13ed5 100644
--- a/src/lib/dns/rdata.cc
+++ b/src/lib/dns/rdata.cc
@@ -35,7 +35,7 @@
 #include <dns/rrtype.h>
 
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::util;
 
 namespace isc {
diff --git a/src/lib/dns/rdata/any_255/tsig_250.cc b/src/lib/dns/rdata/any_255/tsig_250.cc
index 9ef887fa89..ff848fa4e1 100644
--- a/src/lib/dns/rdata/any_255/tsig_250.cc
+++ b/src/lib/dns/rdata/any_255/tsig_250.cc
@@ -29,7 +29,7 @@
 #include <dns/tsigerror.h>
 
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::util;
 using namespace isc::util::encode;
 using namespace isc::util::str;
diff --git a/src/lib/dns/rdata/generic/hinfo_13.cc b/src/lib/dns/rdata/generic/hinfo_13.cc
index b1aeaa1f37..12f034c138 100644
--- a/src/lib/dns/rdata/generic/hinfo_13.cc
+++ b/src/lib/dns/rdata/generic/hinfo_13.cc
@@ -28,7 +28,7 @@
 #include <util/strutil.h>
 
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::util;
 using namespace isc::dns;
 using namespace isc::dns::characterstr;
diff --git a/src/lib/dns/rdata/generic/mx_15.cc b/src/lib/dns/rdata/generic/mx_15.cc
index 4765222323..b95ba059e0 100644
--- a/src/lib/dns/rdata/generic/mx_15.cc
+++ b/src/lib/dns/rdata/generic/mx_15.cc
@@ -27,7 +27,7 @@
 #include <dns/rdataclass.h>
 
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::util;
 
 // BEGIN_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/naptr_35.cc b/src/lib/dns/rdata/generic/naptr_35.cc
index 957cb725c3..0958eff5ee 100644
--- a/src/lib/dns/rdata/generic/naptr_35.cc
+++ b/src/lib/dns/rdata/generic/naptr_35.cc
@@ -27,7 +27,7 @@
 #include <dns/rdataclass.h>
 
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::util;
 using namespace isc::dns;
 using namespace isc::dns::characterstr;
diff --git a/src/lib/dns/rdata/generic/nsec3_50.cc b/src/lib/dns/rdata/generic/nsec3_50.cc
index 89f188af26..fb92246f8b 100644
--- a/src/lib/dns/rdata/generic/nsec3_50.cc
+++ b/src/lib/dns/rdata/generic/nsec3_50.cc
@@ -162,7 +162,7 @@ NSEC3::toText() const {
     ostringstream s;
     bitmapsToText(impl_->typebits_, s);
 
-    using namespace boost;
+    using boost::lexical_cast;
     return (lexical_cast<string>(static_cast<int>(impl_->hashalg_)) +
             " " + lexical_cast<string>(static_cast<int>(impl_->flags_)) +
             " " + lexical_cast<string>(static_cast<int>(impl_->iterations_)) +
diff --git a/src/lib/dns/rdata/generic/nsec3param_51.cc b/src/lib/dns/rdata/generic/nsec3param_51.cc
index 6614bdc5f7..5686353c53 100644
--- a/src/lib/dns/rdata/generic/nsec3param_51.cc
+++ b/src/lib/dns/rdata/generic/nsec3param_51.cc
@@ -95,7 +95,7 @@ NSEC3PARAM::~NSEC3PARAM() {
 
 string
 NSEC3PARAM::toText() const {
-    using namespace boost;
+    using boost::lexical_cast;
     return (lexical_cast<string>(static_cast<int>(impl_->hashalg_)) +
             " " + lexical_cast<string>(static_cast<int>(impl_->flags_)) +
             " " + lexical_cast<string>(static_cast<int>(impl_->iterations_)) +
diff --git a/src/lib/dns/rdata/generic/soa_6.cc b/src/lib/dns/rdata/generic/soa_6.cc
index e70db0fb23..f2b9627163 100644
--- a/src/lib/dns/rdata/generic/soa_6.cc
+++ b/src/lib/dns/rdata/generic/soa_6.cc
@@ -27,7 +27,7 @@
 #include <dns/rdataclass.h>
 
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::util;
 
 // BEGIN_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/sshfp_44.cc b/src/lib/dns/rdata/generic/sshfp_44.cc
index 6fa8609ab6..f4bbb537c3 100644
--- a/src/lib/dns/rdata/generic/sshfp_44.cc
+++ b/src/lib/dns/rdata/generic/sshfp_44.cc
@@ -28,7 +28,7 @@
 #include <dns/rdataclass.h>
 
 using namespace std;
-using namespace boost;
+using boost::lexical_cast;
 using namespace isc::util;
 using namespace isc::util::encode;
 
diff --git a/src/lib/dns/rdata/in_1/srv_33.cc b/src/lib/dns/rdata/in_1/srv_33.cc
index a1a3909d21..af8bbe3ad2 100644
--- a/src/lib/dns/rdata/in_1/srv_33.cc
+++ b/src/lib/dns/rdata/in_1/srv_33.cc
@@ -157,7 +157,7 @@ SRV::~SRV() {
 /// \return A \c string object that represents the \c SRV object.
 string
 SRV::toText() const {
-    using namespace boost;
+    using boost::lexical_cast;
     return (lexical_cast<string>(impl_->priority_) +
         " " + lexical_cast<string>(impl_->weight_) +
         " " + lexical_cast<string>(impl_->port_) +
diff --git a/src/lib/server_common/tests/client_unittest.cc b/src/lib/server_common/tests/client_unittest.cc
index c8db846f95..08c24bae22 100644
--- a/src/lib/server_common/tests/client_unittest.cc
+++ b/src/lib/server_common/tests/client_unittest.cc
@@ -31,7 +31,8 @@
 
 #include <gtest/gtest.h>
 
-using namespace boost;
+using boost::lexical_cast;
+using boost::scoped_ptr;
 using namespace isc::acl;
 using namespace isc::asiolink;
 using namespace isc::server_common;