[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 df94c1283b322972772d073cef32a3dd7ae6473b..c8fe9c6d819f7a20751c0066a0744fcba5bcd272 100644 (file)
--- 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 38ab5cca432b1074758c1f82121b31d6623e654d..a50a752d18448539e1f620a435cea07d017b9b7e 100644 (file)
--- 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 a8ba55e7fa8e0eb9850450b2dd727c7ee4cec813..82a5e54d65cd2c3481cabb834489606695293f8b 100644 (file)
--- 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 447b47986d81c081b07714cb072e325c8fd44b26..e2a20edd594c9217bfccd7e324faec1c6caa3260 100644 (file)
--- 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 0a1625a206a51d1b4d104d6f8002fab412137a7b..80b0df77df81823bd12fd92423dae15989b40aa0 100644 (file)
--- 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 59a58871b80d23bb64e5394cfd4f97a7b6714ff4..c7eaa13ed5b72f83ddbdc1bd9b8c9d63efd67d99 100644 (file)
--- 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 9ef887fa899480954caf92465cca37bdd228495f..ff848fa4e19718f6c50da286a742be388ea9eda8 100644 (file)
--- 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 b1aeaa1f3779da9ce709e5a984340b66ced3f4ea..12f034c138a72266f7deb002cb6c4eadeb44ec83 100644 (file)
--- 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 4765222323fbc482a7eec820d8ac3c73fe050d40..b95ba059e0b575c3089b0d9597130bec64bb512a 100644 (file)
--- 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 957cb725c3c1f1b727e926ccba21e550f4ece73c..0958eff5ee705ffee0d425e00cf54d0946f5c33d 100644 (file)
--- 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 89f188af263c27fa9a777b855202708b999d6b02..fb92246f8bc653452600818ad37935c894ca2df8 100644 (file)
--- 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 6614bdc5f70a5952762822d3e277556a8c843874..5686353c53429d56149b84b3aaca9b061092e584 100644 (file)
--- 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 e70db0fb231d02e8cdb7f56a34d9eef690012692..f2b9627163f648197a75cd84fd37d6c17f515e4c 100644 (file)
--- 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 6fa8609ab6dc359b3061262783362a44c23e317a..f4bbb537c343d89be38155d9cdee1cc69627a81c 100644 (file)
--- 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 a1a3909d21c4196ed58d5cd36915f91e942b905e..af8bbe3ad2a3c408be355324d9e65128949dfa2c 100644 (file)
--- 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 c8db846f95fcc40a1b9f1d43d4b01f6a1d53da31..08c24bae222332ee1832cda7ce7de19a0677b697 100644 (file)
--- 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;