[2157] Counters::get() now returns ConstElementPtr.

diff --git a/src/bin/auth/statistics.cc.pre b/src/bin/auth/statistics.cc.pre
index 090c15e73bb2aea7696d512956f4e6466d4592e6..614b56078d3e357ad2625313ba051eb2e1435cac 100644 (file)
--- a/src/bin/auth/statistics.cc.pre
+++ b/src/bin/auth/statistics.cc.pre
@@ -31,23 +31,22 @@ using namespace isc::auth::statistics;
 
 namespace {
 
-/// \brief Fill ItemTreePtr with given counter.
+/// \brief Fill isc::data::ElementPtr with given counter.
 /// \param counter Counter which stores values to fill
 /// \param type_tree CounterSpec corresponding to counter for building item
 ///                  name
-/// \param trees ItemTreePtr to be filled in; caller has ownership of
-///              ItemTreePtr
+/// \param trees isc::data::ElementPtr to be filled in; caller has ownership of
+///              isc::data::ElementPtr
 void
 fillNodes(const Counter& counter,
           const struct isc::auth::statistics::CounterSpec type_tree[],
-          isc::auth::statistics::Counters::ItemTreePtr& trees)
+          isc::data::ElementPtr& trees)
 {
     using namespace isc::data;
 
     for (int i = 0; type_tree[i].name != NULL; ++i) {
         if (type_tree[i].sub_counters != NULL) {
-            isc::auth::statistics::Counters::ItemTreePtr sub_counters =
-                Element::createMap();
+            isc::data::ElementPtr sub_counters = Element::createMap();
             trees->set(type_tree[i].name, sub_counters);
             fillNodes(counter, type_tree[i].sub_counters, sub_counters);
         } else {
@@ -242,16 +241,16 @@ Counters::inc(const MessageAttributes& msgattrs, const Message& response,
     }
 }
 
-Counters::ItemTreePtr
+Counters::ConstItemTreePtr
 Counters::get() const {
     using namespace isc::data;
 
-    Counters::ItemTreePtr item_tree = Element::createMap();
+    isc::data::ElementPtr item_tree = Element::createMap();
 
-    Counters::ItemTreePtr zones = Element::createMap();
+    isc::data::ElementPtr zones = Element::createMap();
     item_tree->set("zones", zones);
 
-    Counters::ItemTreePtr server = Element::createMap();
+    isc::data::ElementPtr server = Element::createMap();
     fillNodes(server_msg_counter_, msg_counter_tree, server);
     zones->set("_SERVER_", server);
 

diff --git a/src/bin/auth/statistics.h b/src/bin/auth/statistics.h
index 697374d9c43a345e1abf6add418f851819917058..7d22b12f83c2b7a003217d2b4cd6c157a9ebc3b4 100644 (file)
--- a/src/bin/auth/statistics.h
+++ b/src/bin/auth/statistics.h
@@ -230,7 +230,7 @@ public:
     ///        item_value is an integer.
     /// \endverbatim
     ///
-    typedef isc::data::ElementPtr ItemTreePtr;
+    typedef isc::data::ConstElementPtr ConstItemTreePtr;
 
     /// \brief The constructor.
     ///
@@ -262,7 +262,7 @@ public:
     ///
     /// \throw std::bad_alloc Internal resource allocation fails
     ///
-    ItemTreePtr get() const;
+    ConstItemTreePtr get() const;
 };
 
 } // namespace statistics