From 8cee0e38d9b8e619b26319a4df83013eb996fe1f Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Tue, 30 Oct 2018 17:29:05 +0100
Subject: [PATCH] :ambulance: fixed #1319

---
 include/nlohmann/detail/meta/type_traits.hpp | 13 ++++---------
 single_include/nlohmann/json.hpp             | 13 ++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
index 801df342..d901f1e0 100644
--- a/include/nlohmann/detail/meta/type_traits.hpp
+++ b/include/nlohmann/detail/meta/type_traits.hpp
@@ -191,15 +191,10 @@ struct is_constructible_object_type_impl <
     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>
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 6b3d19f0..87e8eae2 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -582,15 +582,10 @@ struct is_constructible_object_type_impl <
     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>