From 5e7bdf1cab080543a8a3b428f18b2be854aa2007 Mon Sep 17 00:00:00 2001
From: gatopeich <gatoguan-os@yahoo.com>
Date: Tue, 23 Jun 2020 15:39:00 +0100
Subject: [PATCH] Roll-back to hard-coded object_t::value_type

---
 include/nlohmann/json.hpp        | 8 ++------
 single_include/nlohmann/json.hpp | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
index 2aef23b3..c85147b3 100644
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@@ -496,12 +496,8 @@ class basic_json
     using object_t = ObjectType<StringType,
           basic_json,
           object_comparator_t,
-          // Note the use of std::map default allocator as a placeholder
-          // to extract the actual ObjectType::value_type
-          AllocatorType<typename
-          ObjectType<StringType, basic_json, object_comparator_t,
-          std::allocator<std::pair<const StringType, basic_json>>
-          >::value_type>>;
+          // Note: this forces object_t::value_type to match std::map's
+          AllocatorType<std::pair<const StringType, basic_json>>>;
 
     /*!
     @brief a type for an array
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 3cf133d5..18cd4a38 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -16355,12 +16355,8 @@ class basic_json
     using object_t = ObjectType<StringType,
           basic_json,
           object_comparator_t,
-          // Note the use of std::map default allocator as a placeholder
-          // to extract the actual ObjectType::value_type
-          AllocatorType<typename
-          ObjectType<StringType, basic_json, object_comparator_t,
-          std::allocator<std::pair<const StringType, basic_json>>
-          >::value_type>>;
+          // Note: this forces object_t::value_type to match std::map's
+          AllocatorType<std::pair<const StringType, basic_json>>>;
 
     /*!
     @brief a type for an array