commit 8cee0e38d9b8e619b26319a4df83013eb996fe1f
author Niels Lohmann <mail@nlohmann.me> Tue Oct 30 17:29:05 2018 +0100
committer Niels Lohmann <mail@nlohmann.me> Tue Oct 30 17:29:05 2018 +0100
tree 69c878fecfae64617506a058c175f8e73ecfd556
parent 856fc31d0a6eb15c8b8900e84e8f2053feaf7252

:ambulance: fixed #1319

include/nlohmann/detail/meta/type_traits.hpp

diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
index 801df34..d901f1e 100644
--- a/include/nlohmann/detail/meta/type_traits.hpp
+++ b/include/nlohmann/detail/meta/type_traits.hpp
@@ -191,15 +191,10 @@
     using object_t = typename BasicJsonType::object_t;
 
     static constexpr bool value =
-        std::is_constructible<typename ConstructibleObjectType::key_type,
-        typename object_t::key_type>::value and
-        (std::is_same<typename object_t::mapped_type,
-         typename ConstructibleObjectType::mapped_type>::value or
-         (has_from_json<BasicJsonType,
-          typename ConstructibleObjectType::mapped_type>::value or
-          has_non_default_from_json <
-          BasicJsonType,
-          typename ConstructibleObjectType::mapped_type >::value));
+        (std::is_constructible<typename ConstructibleObjectType::key_type, typename object_t::key_type>::value and
+         std::is_same<typename object_t::mapped_type, typename ConstructibleObjectType::mapped_type>::value) or
+        (has_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type>::value or
+         has_non_default_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type >::value);
 };
 
 template <typename BasicJsonType, typename ConstructibleObjectType>

single_include/nlohmann/json.hpp

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 6b3d19f..87e8eae 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -582,15 +582,10 @@
     using object_t = typename BasicJsonType::object_t;
 
     static constexpr bool value =
-        std::is_constructible<typename ConstructibleObjectType::key_type,
-        typename object_t::key_type>::value and
-        (std::is_same<typename object_t::mapped_type,
-         typename ConstructibleObjectType::mapped_type>::value or
-         (has_from_json<BasicJsonType,
-          typename ConstructibleObjectType::mapped_type>::value or
-          has_non_default_from_json <
-          BasicJsonType,
-          typename ConstructibleObjectType::mapped_type >::value));
+        (std::is_constructible<typename ConstructibleObjectType::key_type, typename object_t::key_type>::value and
+         std::is_same<typename object_t::mapped_type, typename ConstructibleObjectType::mapped_type>::value) or
+        (has_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type>::value or
+         has_non_default_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type >::value);
 };
 
 template <typename BasicJsonType, typename ConstructibleObjectType>