From 5fe3d3929a523eef4c64f0893db0969a12d3704e Mon Sep 17 00:00:00 2001
From: gatopeich <gatoguan-os@yahoo.com>
Date: Mon, 22 Jun 2020 19:10:35 +0100
Subject: [PATCH] Using ordered_json instead of fifo_map in test-regression
 This is more comprehensive and the "my_workaround_fifo_map" wrapper does not
 allow to infer value type as required in this branch.

This reverts commit 064a9c92126822d246b2e08c28b57d0fc2c44c29.
---
 include/nlohmann/json.hpp        | 4 +---
 single_include/nlohmann/json.hpp | 4 +---
 test/src/unit-regression.cpp     | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
index 69afaf0532..dc44c12c0a 100644
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@@ -496,9 +496,7 @@ class basic_json
     using object_t = ObjectType<StringType,
           basic_json,
           object_comparator_t,
-          // Note: instantiating ObjectType with dummy allocator to extract ::value_type
-          AllocatorType<typename ObjectType<StringType, basic_json, object_comparator_t, AllocatorType<int>
-                                            >::value_type>>;
+          AllocatorType<typename ObjectType<StringType, basic_json>::value_type>>;
 
     /*!
     @brief a type for an array
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index e6d87b31e1..2d3d31a0e6 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -16348,9 +16348,7 @@ class basic_json
     using object_t = ObjectType<StringType,
           basic_json,
           object_comparator_t,
-          // Note: instantiating ObjectType with dummy allocator to extract ::value_type
-          AllocatorType<typename ObjectType<StringType, basic_json, object_comparator_t, AllocatorType<int>
-                                            >::value_type>>;
+          AllocatorType<typename ObjectType<StringType, basic_json>::value_type>>;
 
     /*!
     @brief a type for an array
diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp
index e5cd0337b3..143508a631 100644
--- a/test/src/unit-regression.cpp
+++ b/test/src/unit-regression.cpp
@@ -52,15 +52,11 @@ using nlohmann::json;
     #include <variant>
 #endif
 
-#include "fifo_map.hpp"
-
 /////////////////////////////////////////////////////////////////////
 // for #972
 /////////////////////////////////////////////////////////////////////
 
-template<class K, class V, class dummy_compare, class A>
-using my_workaround_fifo_map = nlohmann::fifo_map<K, V, nlohmann::fifo_map_compare<K>, A>;
-using my_json = nlohmann::basic_json<my_workaround_fifo_map>;
+using my_json = nlohmann::ordered_json;
 
 /////////////////////////////////////////////////////////////////////
 // for #977