j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Using ordered_json instead of fifo_map in test-regression"

Browse source 
This reverts commit 5fe3d3929a.
This commit is contained in:
gatopeich 2020-06-23 11:30:52 +01:00
parent 5fe3d3929a
commit 49623a75ee
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/nlohmann/json.hpp
View file

@ -496,7 +496,9 @@ class basic_json
using object_t = ObjectType<StringType,
basic_json,
object_comparator_t,
AllocatorType<typename ObjectType<StringType, basic_json>::value_type>>;
// Note: instantiating ObjectType with dummy allocator to extract ::value_type
AllocatorType<typename ObjectType<StringType, basic_json, object_comparator_t, AllocatorType<int>
>::value_type>>;
/*!
@brief a type for an array

4
single_include/nlohmann/json.hpp
View file

@ -16348,7 +16348,9 @@ class basic_json
using object_t = ObjectType<StringType,
basic_json,
object_comparator_t,
AllocatorType<typename ObjectType<StringType, basic_json>::value_type>>;
// Note: instantiating ObjectType with dummy allocator to extract ::value_type
AllocatorType<typename ObjectType<StringType, basic_json, object_comparator_t, AllocatorType<int>
>::value_type>>;
/*!
@brief a type for an array

6
test/src/unit-regression.cpp
View file

@ -52,11 +52,15 @@ using nlohmann::json;
#include <variant>
#endif
#include "fifo_map.hpp"
/////////////////////////////////////////////////////////////////////
// for #972
/////////////////////////////////////////////////////////////////////
using my_json = nlohmann::ordered_json;
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>;
/////////////////////////////////////////////////////////////////////
// for #977