[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea

src/bin/dhcp4/json_config_parser.cc

@@ -566,7 +566,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
         // This is a way to convert ConstElementPtr to ElementPtr.
         // We need a config that can be edited, because we will insert
         // default values and will insert derived values as well.
-        ElementPtr mutable_cfg = const_pointer_cast<Element>(config_set);
+        ElementPtr mutable_cfg = boost::const_pointer_cast<Element>(config_set);
 
         // Set all default values if not specified by the user.
         SimpleParser4::setAllDefaults(mutable_cfg);

src/bin/dhcp6/json_config_parser.cc

@@ -840,7 +840,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
         // This is a way to convert ConstElementPtr to ElementPtr.
         // We need a config that can be edited, because we will insert
         // default values and will insert derived values as well.
-        ElementPtr mutable_cfg = const_pointer_cast<Element>(config_set);
+        ElementPtr mutable_cfg = boost::const_pointer_cast<Element>(config_set);
 
         SimpleParser6::setAllDefaults(mutable_cfg);
 

src/lib/cc/data.cc

@@ -1084,14 +1084,5 @@ void Element::preprocess(std::istream& in, std::stringstream& out) {
     }
 }
 
-ElementPtr Element::getMutableMap(ConstElementPtr& const_map) {
-    std::map<std::string, ConstElementPtr> values;
-    const_map->getValue(values);
-    ElementPtr mutable_map(new MapElement());
-    mutable_map->setValue(values);
-
-    return (mutable_map);
-}
-
 }
 }

src/lib/cc/data.h

@@ -527,12 +527,6 @@ public:
     /// \return ElementPtr with the data that is parsed.
     static ElementPtr fromWire(const std::string& s);
     //@}
-
-    /// @brief Creates mutable map based on const map
-    ///
-    /// @param const_map const map to be used as a donor
-    /// @return mutable map
-    static ElementPtr getMutableMap(ConstElementPtr& const_map);
 };
 
 /// Notes: IntElement type is changed to int64_t.