提交 ea104611 编写于 作者: N Niels

using "key_type" where possible

上级 b7478814
...@@ -405,7 +405,7 @@ class basic_json ...@@ -405,7 +405,7 @@ class basic_json
/// create an object (implicit) /// create an object (implicit)
template <class V, typename template <class V, typename
std::enable_if< 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 std::is_constructible<basic_json, typename V::mapped_type>::value, int>::type
= 0> = 0>
inline basic_json(const V& value) inline basic_json(const V& value)
...@@ -808,7 +808,7 @@ class basic_json ...@@ -808,7 +808,7 @@ class basic_json
/// get an object (explicit) /// get an object (explicit)
template <class T, typename template <class T, typename
std::enable_if< 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 std::is_constructible<basic_json, typename T::mapped_type>::value, int>::type
= 0> = 0>
inline T get() const inline T get() const
...@@ -842,7 +842,7 @@ class basic_json ...@@ -842,7 +842,7 @@ class basic_json
/// get a string (explicit) /// get a string (explicit)
template <typename T, typename template <typename T, typename
std::enable_if< std::enable_if<
std::is_constructible<string_t, T>::value, int>::type std::is_constructible<T, string_t>::value, int>::type
= 0> = 0>
inline T get() const inline T get() const
{ {
......
...@@ -405,7 +405,7 @@ class basic_json ...@@ -405,7 +405,7 @@ class basic_json
/// create an object (implicit) /// create an object (implicit)
template <class V, typename template <class V, typename
std::enable_if< 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 std::is_constructible<basic_json, typename V::mapped_type>::value, int>::type
= 0> = 0>
inline basic_json(const V& value) inline basic_json(const V& value)
...@@ -808,7 +808,7 @@ class basic_json ...@@ -808,7 +808,7 @@ class basic_json
/// get an object (explicit) /// get an object (explicit)
template <class T, typename template <class T, typename
std::enable_if< 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 std::is_constructible<basic_json, typename T::mapped_type>::value, int>::type
= 0> = 0>
inline T get() const inline T get() const
...@@ -842,7 +842,7 @@ class basic_json ...@@ -842,7 +842,7 @@ class basic_json
/// get a string (explicit) /// get a string (explicit)
template <typename T, typename template <typename T, typename
std::enable_if< std::enable_if<
std::is_constructible<string_t, T>::value, int>::type std::is_constructible<T, string_t>::value, int>::type
= 0> = 0>
inline T get() const inline T get() const
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册