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 - >::value_type>>; + AllocatorType::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 - >::value_type>>; + AllocatorType::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 #endif -#include "fifo_map.hpp" - ///////////////////////////////////////////////////////////////////// // for #972 ///////////////////////////////////////////////////////////////////// -template -using my_workaround_fifo_map = nlohmann::fifo_map, A>; -using my_json = nlohmann::basic_json; +using my_json = nlohmann::ordered_json; ///////////////////////////////////////////////////////////////////// // for #977