Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
a6251e3f
Commit
a6251e3f
authored
Jan 04, 2017
by
Francis Dupont
Browse files
[master] Merge branch 'master' of
ssh://git.kea.isc.org/git/kea
parents
8bedb2ea
12e3d281
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/json_config_parser.cc
View file @
a6251e3f
...
...
@@ -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
View file @
a6251e3f
...
...
@@ -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
View file @
a6251e3f
...
...
@@ -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
View file @
a6251e3f
...
...
@@ -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.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment