mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-11-24 06:29:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Using ordered_json instead of fifo_map in test-regression

Browse Source 
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 064a9c9212.
This commit is contained in:
gatopeich 2020-06-22 19:10:35 +01:00
parent 064a9c9212
commit 5fe3d3929a
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/json.hpp
View File

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

4
single_include/nlohmann/json.hpp
View File

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

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

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