Skip to content

J
json
Unverified Commit 3c60a66c by Niels Lohmann Committed by GitHub
Options

Merge pull request #2104 from dota17/issue#2086

Fix issue#2086: disallow json::value_t type parameter in value()
parents 27fe50dc cdf5327a
Showing with 4 additions and 2 deletions
include/nlohmann/json.hpp
......@@ -3768,7 +3768,8 @@ class basic_json
@since version 1.0.0
*/
template<class ValueType, typename std::enable_if<
std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
std::is_convertible<basic_json_t, ValueType>::value
and not std::is_same<value_t, ValueType>::value, int>::type = 0>
ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
{
// at only works for objects
......
single_include/nlohmann/json.hpp
......@@ -19560,7 +19560,8 @@ class basic_json
@since version 1.0.0
*/
template<class ValueType, typename std::enable_if<
std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
std::is_convertible<basic_json_t, ValueType>::value
and not std::is_same<value_t, ValueType>::value, int>::type = 0>
ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
{
// at only works for objects
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment