BIND 10 trac1470, updated. 502cc85e6d101d89210cf8a1a41f06ea8b2412dd [1470] fix a few more shared_ptr namespaces
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Dec 14 11:13:24 UTC 2011
The branch, trac1470 has been updated
via 502cc85e6d101d89210cf8a1a41f06ea8b2412dd (commit)
from 3f83fac07d34fc709aebe528028f041fc3637bab (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 502cc85e6d101d89210cf8a1a41f06ea8b2412dd
Author: Jelte Jansen <jelte at isc.org>
Date: Wed Dec 14 12:03:51 2011 +0100
[1470] fix a few more shared_ptr namespaces
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/auth_config.cc | 14 +++++++-------
src/bin/auth/auth_srv.cc | 5 ++---
src/bin/auth/command.cc | 5 ++---
src/bin/auth/tests/auth_srv_unittest.cc | 9 ++++-----
src/lib/acl/tests/acl_test.cc | 5 ++---
src/lib/asiolink/tests/io_endpoint_unittest.cc | 3 +--
src/lib/dhcp/tests/pkt4_unittest.cc | 14 +++++++-------
7 files changed, 25 insertions(+), 30 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_config.cc b/src/bin/auth/auth_config.cc
index d684c68..2ae520c 100644
--- a/src/bin/auth/auth_config.cc
+++ b/src/bin/auth/auth_config.cc
@@ -35,7 +35,6 @@
#include <server_common/portconfig.h>
using namespace std;
-using boost::shared_ptr;
using namespace isc::dns;
using namespace isc::data;
using namespace isc::datasrc;
@@ -56,7 +55,7 @@ public:
virtual void commit();
private:
AuthSrv& server_;
- vector<shared_ptr<AuthConfigParser> > datasources_;
+ vector<boost::shared_ptr<AuthConfigParser> > datasources_;
set<string> configured_sources_;
};
@@ -86,8 +85,8 @@ DatasourcesConfig::build(ConstElementPtr config_value) {
datasrc_type->stringValue() << "' already configured");
}
- shared_ptr<AuthConfigParser> datasrc_config =
- shared_ptr<AuthConfigParser>(
+ boost::shared_ptr<AuthConfigParser> datasrc_config =
+ boost::shared_ptr<AuthConfigParser>(
createAuthConfigParser(server_, string("datasources/") +
datasrc_type->stringValue(),
true));
@@ -109,7 +108,8 @@ DatasourcesConfig::commit() {
// Currently memory data source for class IN is the only possibility.
server_.setInMemoryClient(RRClass::IN(), AuthSrv::InMemoryClientPtr());
- BOOST_FOREACH(shared_ptr<AuthConfigParser> datasrc_config, datasources_) {
+ BOOST_FOREACH(boost::shared_ptr<AuthConfigParser> datasrc_config,
+ datasources_) {
datasrc_config->commit();
}
}
@@ -163,7 +163,7 @@ MemoryDatasourceConfig::build(ConstElementPtr config_value) {
isc_throw(AuthConfigError, "Missing zone file for zone: "
<< origin->str());
}
- shared_ptr<InMemoryZoneFinder> zone_finder(new
+ boost::shared_ptr<InMemoryZoneFinder> zone_finder(new
InMemoryZoneFinder(rrclass_,
Name(origin->stringValue())));
const result::Result result = memory_client_->addZone(zone_finder);
@@ -327,7 +327,7 @@ configureAuthServer(AuthSrv& server, ConstElementPtr config_set) {
"Null pointer is passed to configuration parser");
}
- typedef shared_ptr<AuthConfigParser> ParserPtr;
+ typedef boost::shared_ptr<AuthConfigParser> ParserPtr;
vector<ParserPtr> parsers;
typedef pair<string, ConstElementPtr> ConfigPair;
try {
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 92eec6f..d9eda8d 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -76,7 +76,6 @@ using namespace isc::xfr;
using namespace isc::asiolink;
using namespace isc::asiodns;
using namespace isc::server_common::portconfig;
-using boost::shared_ptr;
class AuthSrvImpl {
private:
@@ -124,7 +123,7 @@ public:
AddressList listen_addresses_;
/// The TSIG keyring
- const shared_ptr<TSIGKeyRing>* keyring_;
+ const boost::shared_ptr<TSIGKeyRing>* keyring_;
/// Bind the ModuleSpec object in config_session_ with
/// isc:config::ModuleSpec::validateStatistics.
@@ -787,6 +786,6 @@ AuthSrv::setDNSService(isc::asiodns::DNSService& dnss) {
}
void
-AuthSrv::setTSIGKeyRing(const shared_ptr<TSIGKeyRing>* keyring) {
+AuthSrv::setTSIGKeyRing(const boost::shared_ptr<TSIGKeyRing>* keyring) {
impl_->keyring_ = keyring;
}
diff --git a/src/bin/auth/command.cc b/src/bin/auth/command.cc
index 940d57b..280558d 100644
--- a/src/bin/auth/command.cc
+++ b/src/bin/auth/command.cc
@@ -32,7 +32,6 @@
#include <auth/command.h>
using boost::scoped_ptr;
-using boost::shared_ptr;
using namespace isc::auth;
using namespace isc::config;
using namespace isc::data;
@@ -136,7 +135,7 @@ public:
// that doesn't block other server operations.
// TODO: we may (should?) want to check the "last load time" and
// the timestamp of the file and skip loading if the file isn't newer.
- shared_ptr<InMemoryZoneFinder> zone_finder(
+ boost::shared_ptr<InMemoryZoneFinder> zone_finder(
new InMemoryZoneFinder(old_zone_finder->getClass(),
old_zone_finder->getOrigin()));
zone_finder->load(old_zone_finder->getFileName());
@@ -147,7 +146,7 @@ public:
private:
// zone finder to be updated with the new file.
- shared_ptr<InMemoryZoneFinder> old_zone_finder;
+ boost::shared_ptr<InMemoryZoneFinder> old_zone_finder;
// A helper private method to parse and validate command parameters.
// On success, it sets 'old_zone_finder' to the zone to be updated.
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index ac25cd6..d938df9 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -54,7 +54,6 @@ using namespace isc::asiolink;
using namespace isc::testutils;
using namespace isc::server_common::portconfig;
using isc::UnitTestUtil;
-using boost::shared_ptr;
namespace {
const char* const CONFIG_TESTDB =
@@ -251,7 +250,7 @@ TEST_F(AuthSrvTest, TSIGSigned) {
createRequestPacket(request_message, IPPROTO_UDP, &context);
// Run the message through the server
- shared_ptr<TSIGKeyRing> keyring(new TSIGKeyRing);
+ boost::shared_ptr<TSIGKeyRing> keyring(new TSIGKeyRing);
keyring->add(key);
server.setTSIGKeyRing(&keyring);
server.processMessage(*io_message, parse_message, response_obuffer,
@@ -285,7 +284,7 @@ TEST_F(AuthSrvTest, TSIGSignedBadKey) {
createRequestPacket(request_message, IPPROTO_UDP, &context);
// Process the message, but use a different key there
- shared_ptr<TSIGKeyRing> keyring(new TSIGKeyRing);
+ boost::shared_ptr<TSIGKeyRing> keyring(new TSIGKeyRing);
server.setTSIGKeyRing(&keyring);
server.processMessage(*io_message, parse_message, response_obuffer,
&dnsserv);
@@ -317,7 +316,7 @@ TEST_F(AuthSrvTest, TSIGBadSig) {
createRequestPacket(request_message, IPPROTO_UDP, &context);
// Process the message, but use a different key there
- shared_ptr<TSIGKeyRing> keyring(new TSIGKeyRing);
+ boost::shared_ptr<TSIGKeyRing> keyring(new TSIGKeyRing);
keyring->add(TSIGKey("key:QkFECg==:hmac-sha1"));
server.setTSIGKeyRing(&keyring);
server.processMessage(*io_message, parse_message, response_obuffer,
@@ -353,7 +352,7 @@ TEST_F(AuthSrvTest, TSIGCheckFirst) {
createRequestPacket(request_message, IPPROTO_UDP, &context);
// Process the message, but use a different key there
- shared_ptr<TSIGKeyRing> keyring(new TSIGKeyRing);
+ boost::shared_ptr<TSIGKeyRing> keyring(new TSIGKeyRing);
keyring->add(TSIGKey("key:QkFECg==:hmac-sha1"));
server.setTSIGKeyRing(&keyring);
server.processMessage(*io_message, parse_message, response_obuffer,
diff --git a/src/lib/acl/tests/acl_test.cc b/src/lib/acl/tests/acl_test.cc
index 15ffef6..485a5a3 100644
--- a/src/lib/acl/tests/acl_test.cc
+++ b/src/lib/acl/tests/acl_test.cc
@@ -18,7 +18,6 @@
using namespace isc::acl;
using namespace isc::acl::tests;
-using boost::shared_ptr;
namespace {
@@ -46,8 +45,8 @@ public:
Log log_;
size_t next_check_;
boost::shared_ptr<Check<Log> > getCheck(bool accepts) {
- return (shared_ptr<Check<Log> >(new ConstCheck(accepts,
- next_check_++)));
+ return (boost::shared_ptr<Check<Log> >(new ConstCheck(accepts,
+ next_check_++)));
}
};
diff --git a/src/lib/asiolink/tests/io_endpoint_unittest.cc b/src/lib/asiolink/tests/io_endpoint_unittest.cc
index c7283ec..948e708 100644
--- a/src/lib/asiolink/tests/io_endpoint_unittest.cc
+++ b/src/lib/asiolink/tests/io_endpoint_unittest.cc
@@ -25,11 +25,10 @@
#include <asiolink/io_endpoint.h>
#include <asiolink/io_error.h>
-using boost::shared_ptr;
using namespace isc::asiolink;
namespace {
-typedef shared_ptr<const IOEndpoint> ConstIOEndpointPtr;
+typedef boost::shared_ptr<const IOEndpoint> ConstIOEndpointPtr;
TEST(IOEndpointTest, createUDPv4) {
ConstIOEndpointPtr ep(IOEndpoint::create(IPPROTO_UDP,
diff --git a/src/lib/dhcp/tests/pkt4_unittest.cc b/src/lib/dhcp/tests/pkt4_unittest.cc
index 091bfac..0e14654 100644
--- a/src/lib/dhcp/tests/pkt4_unittest.cc
+++ b/src/lib/dhcp/tests/pkt4_unittest.cc
@@ -197,7 +197,7 @@ generateTestPacket2() {
TEST(Pkt4Test, fixedFields) {
- shared_ptr<Pkt4> pkt = generateTestPacket1();
+ boost::shared_ptr<Pkt4> pkt = generateTestPacket1();
// ok, let's check packet values
EXPECT_EQ(dummyOp, pkt->getOp());
@@ -224,7 +224,7 @@ TEST(Pkt4Test, fixedFields) {
}
TEST(Pkt4Test, fixedFieldsPack) {
- shared_ptr<Pkt4> pkt = generateTestPacket1();
+ boost::shared_ptr<Pkt4> pkt = generateTestPacket1();
vector<uint8_t> expectedFormat = generateTestPacket2();
EXPECT_NO_THROW(
@@ -244,8 +244,8 @@ TEST(Pkt4Test, fixedFieldsPack) {
TEST(Pkt4Test, fixedFieldsUnpack) {
vector<uint8_t> expectedFormat = generateTestPacket2();
- shared_ptr<Pkt4> pkt(new Pkt4(&expectedFormat[0],
- Pkt4::DHCPV4_PKT_HDR_LEN));
+ boost::shared_ptr<Pkt4> pkt(new Pkt4(&expectedFormat[0],
+ Pkt4::DHCPV4_PKT_HDR_LEN));
EXPECT_NO_THROW(
pkt->unpack()
@@ -512,8 +512,8 @@ TEST(Pkt4Test, unpackOptions) {
// now expectedFormat contains fixed format and 5 options
- shared_ptr<Pkt4> pkt(new Pkt4(&expectedFormat[0],
- expectedFormat.size()));
+ boost::shared_ptr<Pkt4> pkt(new Pkt4(&expectedFormat[0],
+ expectedFormat.size()));
EXPECT_NO_THROW(
pkt->unpack()
@@ -525,7 +525,7 @@ TEST(Pkt4Test, unpackOptions) {
EXPECT_TRUE(pkt->getOption(128));
EXPECT_TRUE(pkt->getOption(254));
- shared_ptr<Option> x = pkt->getOption(12);
+ boost::shared_ptr<Option> x = pkt->getOption(12);
ASSERT_TRUE(x); // option 1 should exist
EXPECT_EQ(12, x->getType()); // this should be option 12
ASSERT_EQ(3, x->getData().size()); // it should be of length 3
More information about the bind10-changes
mailing list