From 15337b2cc3c911efdb3d98bfbc50bc8d513bc8bb Mon Sep 17 00:00:00 2001
From: gatopeich <gatoguan-os@yahoo.com>
Date: Mon, 22 Jun 2020 00:03:48 +0100
Subject: [PATCH] Ignore allocator hardcoded to match std::map

---
 include/nlohmann/json.hpp        | 1 +
 include/nlohmann/ordered_map.hpp | 4 ++--
 single_include/nlohmann/json.hpp | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
index 15921726..5e53e4f9 100644
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@@ -496,6 +496,7 @@ class basic_json
     using object_t = ObjectType<StringType,
           basic_json,
           object_comparator_t,
+          // TODO: AllocatorType<ObjectType::value_type>
           AllocatorType<std::pair<const StringType,
           basic_json>>>;
 
diff --git a/include/nlohmann/ordered_map.hpp b/include/nlohmann/ordered_map.hpp
index 756b586a..2fa00c0d 100644
--- a/include/nlohmann/ordered_map.hpp
+++ b/include/nlohmann/ordered_map.hpp
@@ -11,8 +11,8 @@ namespace nlohmann
 /// ordered_map: a minimal map-like container that preserves insertion order
 /// for use within nlohmann::basic_json<ordered_map>
 template <class Key, class T, class IgnoredLess = std::less<Key>,
-          class Allocator = std::allocator<std::pair<Key, T>>,
-          class Container = std::vector<std::pair<Key, T>, Allocator>>
+          class IgnoredAllocator = std::allocator<std::pair<Key, T>>,
+          class Container = std::vector<std::pair<Key, T>>>
 struct ordered_map : Container
 {
     using key_type = Key;
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index b524fe69..43da17f5 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -15880,8 +15880,8 @@ namespace nlohmann
 /// ordered_map: a minimal map-like container that preserves insertion order
 /// for use within nlohmann::basic_json<ordered_map>
 template <class Key, class T, class IgnoredLess = std::less<Key>,
-          class Allocator = std::allocator<std::pair<Key, T>>,
-          class Container = std::vector<std::pair<Key, T>, Allocator>>
+          class IgnoredAllocator = std::allocator<std::pair<Key, T>>,
+          class Container = std::vector<std::pair<Key, T>>>
 struct ordered_map : Container
 {
     using key_type = Key;
@@ -16348,6 +16348,7 @@ class basic_json
     using object_t = ObjectType<StringType,
           basic_json,
           object_comparator_t,
+          // TODO: AllocatorType<ObjectType::value_type>
           AllocatorType<std::pair<const StringType,
           basic_json>>>;