j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

using "key_type" where possible

Browse source
This commit is contained in:
Niels 2015-04-03 14:43:44 +02:00
parent b747881466
commit ea1046110d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/json.hpp
View file

@ -405,7 +405,7 @@ class basic_json
/// create an object (implicit)
template <class V, typename
std::enable_if<
std::is_constructible<string_t, typename V::key_type>::value and
std::is_constructible<typename object_t::key_type, typename V::key_type>::value and
std::is_constructible<basic_json, typename V::mapped_type>::value, int>::type
= 0>
inline basic_json(const V& value)
@ -808,7 +808,7 @@ class basic_json
/// get an object (explicit)
template <class T, typename
std::enable_if<
std::is_constructible<typename T::key_type, string_t>::value and
std::is_constructible<typename T::key_type, typename object_t::key_type>::value and
std::is_constructible<basic_json, typename T::mapped_type>::value, int>::type
= 0>
inline T get() const
@ -842,7 +842,7 @@ class basic_json
/// get a string (explicit)
template <typename T, typename
std::enable_if<
std::is_constructible<string_t, T>::value, int>::type
std::is_constructible<T, string_t>::value, int>::type
= 0>
inline T get() const
{

6
src/json.hpp.re2c
View file

@ -405,7 +405,7 @@ class basic_json
/// create an object (implicit)
template <class V, typename
std::enable_if<
std::is_constructible<string_t, typename V::key_type>::value and
std::is_constructible<typename object_t::key_type, typename V::key_type>::value and
std::is_constructible<basic_json, typename V::mapped_type>::value, int>::type
= 0>
inline basic_json(const V& value)
@ -808,7 +808,7 @@ class basic_json
/// get an object (explicit)
template <class T, typename
std::enable_if<
std::is_constructible<typename T::key_type, string_t>::value and
std::is_constructible<typename T::key_type, typename object_t::key_type>::value and
std::is_constructible<basic_json, typename T::mapped_type>::value, int>::type
= 0>
inline T get() const
@ -842,7 +842,7 @@ class basic_json
/// get a string (explicit)
template <typename T, typename
std::enable_if<
std::is_constructible<string_t, T>::value, int>::type
std::is_constructible<T, string_t>::value, int>::type
= 0>
inline T get() const
{