BIND 10 master, updated. 438f31e7886d2e280fa4a35c8e06a3b0d3c2b9e0 [master] fix errors with ambiguous types and other boost uses
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jul 25 12:51:47 UTC 2012
The branch, master has been updated
via 438f31e7886d2e280fa4a35c8e06a3b0d3c2b9e0 (commit)
via 40f1877422efbd82a91e2f4794364acf5400d788 (commit)
from 6ef9a033a509e20fd993dac75fb21c287c23e864 (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 438f31e7886d2e280fa4a35c8e06a3b0d3c2b9e0
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Wed Jul 25 07:49:12 2012 -0500
[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.
commit 40f1877422efbd82a91e2f4794364acf5400d788
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Wed Jul 25 07:48:16 2012 -0500
[master] fix "error: reference to `map' is ambiguous"
-----------------------------------------------------------------------
Summary of changes:
.../auth/tests/datasrc_configurator_unittest.cc | 4 ++--
src/lib/cryptolink/tests/crypto_unittests.cc | 2 +-
src/lib/datasrc/client_list.cc | 4 +++-
src/lib/datasrc/database.cc | 3 ++-
src/lib/dns/edns.cc | 2 +-
src/lib/dns/message.cc | 2 +-
src/lib/dns/rdata.cc | 2 +-
src/lib/dns/rdata/any_255/tsig_250.cc | 2 +-
src/lib/dns/rdata/generic/hinfo_13.cc | 2 +-
src/lib/dns/rdata/generic/mx_15.cc | 2 +-
src/lib/dns/rdata/generic/naptr_35.cc | 2 +-
src/lib/dns/rdata/generic/nsec3_50.cc | 2 +-
src/lib/dns/rdata/generic/nsec3param_51.cc | 2 +-
src/lib/dns/rdata/generic/soa_6.cc | 2 +-
src/lib/dns/rdata/generic/sshfp_44.cc | 2 +-
src/lib/dns/rdata/in_1/srv_33.cc | 2 +-
src/lib/server_common/tests/client_unittest.cc | 3 ++-
17 files changed, 22 insertions(+), 18 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/tests/datasrc_configurator_unittest.cc b/src/bin/auth/tests/datasrc_configurator_unittest.cc
index 12454f0..78e3688 100644
--- a/src/bin/auth/tests/datasrc_configurator_unittest.cc
+++ b/src/bin/auth/tests/datasrc_configurator_unittest.cc
@@ -75,7 +75,7 @@ public:
}
vector<RRClass> getClientListClasses() const {
vector<RRClass> result;
- for (map<RRClass, ListPtr>::const_iterator it(lists_.begin());
+ for (std::map<RRClass, ListPtr>::const_iterator it(lists_.begin());
it != lists_.end(); ++it) {
result.push_back(it->first);
}
@@ -135,7 +135,7 @@ protected:
FakeSession session;
auto_ptr<ModuleCCSession> mccs;
const string specfile;
- map<RRClass, ListPtr> lists_;
+ std::map<RRClass, ListPtr> lists_;
string log_;
};
diff --git a/src/lib/cryptolink/tests/crypto_unittests.cc b/src/lib/cryptolink/tests/crypto_unittests.cc
index df94c12..c8fe9c6 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 38ab5cc..a50a752 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 a8ba55e..82a5e54 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 447b479..e2a20ed 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 0a1625a..80b0df7 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 59a5887..c7eaa13 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 9ef887f..ff848fa 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 b1aeaa1..12f034c 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 4765222..b95ba05 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 957cb72..0958eff 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 89f188a..fb92246 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 6614bdc..5686353 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 e70db0f..f2b9627 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 6fa8609..f4bbb53 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 a1a3909..af8bbe3 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 c8db846..08c24ba 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;
More information about the bind10-changes
mailing list