From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 22 Oct 2012 01:45:49 +0000 (+0530)
Subject: [2208] Don't use .get() syntax in some places in managed ptrs
X-Git-Tag: trac2487_base~21^2~8^2~8^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61256f84ff903ba7f0bddd2569f9fddcdbb194d2;p=thirdparty%2Fkea.git

[2208] Don't use .get() syntax in some places in managed ptrs
---

diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index 402f8b824f..e83c105cd4 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -1402,8 +1402,7 @@ public:
         ConfigurableClientList(RRClass::IN()),
         real_(real_list),
         config_(Element::fromJSON("{}")),
-        segment_(isc::datasrc::memory::ZoneTableSegment::create(
-            (*config_.get())))
+        segment_(isc::datasrc::memory::ZoneTableSegment::create(*config_))
     {
         BOOST_FOREACH(const DataSourceInfo& info, real_->getDataSources()) {
              const isc::datasrc::DataSourceClientPtr
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index c76ac9c936..348ef8ea9e 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -93,7 +93,7 @@ ConfigurableClientList::configure(const ConstElementPtr& config,
     try {
         vector<DataSourceInfo> new_data_sources;
         shared_ptr<ZoneTableSegment> ztable_segment(
-             ZoneTableSegment::create(*config.get()));
+             ZoneTableSegment::create(*config));
         for (; i < config->size(); ++i) {
             // Extract the parameters
             const ConstElementPtr dconf(config->get(i));
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index 8df18fce6b..2b78c61030 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -257,7 +257,7 @@ public:
             "                \"noiter.org\", \"null.org\"]"
             "}]")),
         config_(Element::fromJSON("{}")),
-        segment_(ZoneTableSegment::create((*config_.get())))
+        segment_(ZoneTableSegment::create(*config_))
     {
         for (size_t i(0); i < ds_count; ++ i) {
             shared_ptr<MockDataSourceClient>
diff --git a/src/lib/datasrc/tests/zone_finder_context_unittest.cc b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
index e89d7fc077..d213a00ca6 100644
--- a/src/lib/datasrc/tests/zone_finder_context_unittest.cc
+++ b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
@@ -67,7 +67,7 @@ createInMemoryClient(RRClass zclass, const Name& zname)
 {
     const ElementPtr config(Element::fromJSON("{}"));
     shared_ptr<ZoneTableSegment> ztable_segment(
-        ZoneTableSegment::create(*config.get()));
+        ZoneTableSegment::create(*config));
     shared_ptr<InMemoryClient> client(new InMemoryClient(ztable_segment,
                                                          zclass));
     client->load(zname, TEST_ZONE_FILE);