BIND 10 trac2853, updated. c8050a3b7d7e3060c59f14c777af5a8ad675f234 [2853] Split DataSourceStatus constructor into two

[BIND 10 source code commits]

The branch, trac2853 has been updated
       via  c8050a3b7d7e3060c59f14c777af5a8ad675f234 (commit)
      from  dde7e27a9effb9702e99f2145254ae13821d7667 (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 c8050a3b7d7e3060c59f14c777af5a8ad675f234
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Jun 12 20:50:32 2013 +0530

    [2853] Split DataSourceStatus constructor into two

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/client_list.cc |    2 +-
 src/lib/datasrc/client_list.h  |   18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index 58444b7..50d30e2 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -417,7 +417,7 @@ ConfigurableClientList::getStatus() const {
                  SEGMENT_INUSE : SEGMENT_WAITING),
                 info.ztable_segment_->getImplType()));
         } else {
-            result.push_back(DataSourceStatus(info.name_, SEGMENT_UNUSED));
+            result.push_back(DataSourceStatus(info.name_));
         }
     }
     return (result);
diff --git a/src/lib/datasrc/client_list.h b/src/lib/datasrc/client_list.h
index 880679a..6fd4bb3 100644
--- a/src/lib/datasrc/client_list.h
+++ b/src/lib/datasrc/client_list.h
@@ -81,13 +81,25 @@ class DataSourceStatus {
 public:
     /// \brief Constructor
     ///
-    /// Sets initial values. It doesn't matter what is provided for the type
-    /// if state is SEGMENT_UNUSED, the value is effectively ignored.
+    /// Sets initial values.
     DataSourceStatus(const std::string& name, MemorySegmentState state,
-                     const std::string& type = std::string()) :
+                     const std::string& type) :
         name_(name),
         type_(type),
         state_(state)
+    {
+        assert (state != SEGMENT_UNUSED);
+        assert (!type.empty());
+    }
+
+    /// \brief Constructor
+    ///
+    /// Sets initial values. The state is set as SEGMENT_UNUSED and the
+    /// type is effectively unspecified.
+    DataSourceStatus(const std::string& name) :
+        name_(name),
+        type_(""),
+        state_(SEGMENT_UNUSED)
     {}
 
     /// \brief Get the segment state