mirror of
https://github.com/nlohmann/json.git
synced 2026-09-04 15:35:01 +00:00
Move the #4804 alias to the file that uses it
The split left the json_4804 alias behind in unit-regression2.cpp while the test case that uses it went to unit-regression3.cpp, which does not build for C++17 and C++20 as a result. Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
@@ -42,22 +42,6 @@ using ordered_json = nlohmann::ordered_json;
|
|||||||
#elif __has_include(<experimental/optional>)
|
#elif __has_include(<experimental/optional>)
|
||||||
#include <experimental/optional>
|
#include <experimental/optional>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////
|
|
||||||
// for #4804
|
|
||||||
/////////////////////////////////////////////////////////////////////
|
|
||||||
using json_4804 = nlohmann::basic_json<std::map, // ObjectType
|
|
||||||
std::vector, // ArrayType
|
|
||||||
std::string, // StringType
|
|
||||||
bool, // BooleanType
|
|
||||||
std::int64_t, // NumberIntegerType
|
|
||||||
std::uint64_t, // NumberUnsignedType
|
|
||||||
double, // NumberFloatType
|
|
||||||
std::allocator, // AllocatorType
|
|
||||||
nlohmann::adl_serializer, // JSONSerializer
|
|
||||||
std::vector<std::byte>, // BinaryType
|
|
||||||
void // CustomBaseClass
|
|
||||||
>;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef JSON_HAS_CPP_20
|
#ifdef JSON_HAS_CPP_20
|
||||||
|
|||||||
@@ -42,6 +42,22 @@ using ordered_json = nlohmann::ordered_json;
|
|||||||
#elif __has_include(<experimental/optional>)
|
#elif __has_include(<experimental/optional>)
|
||||||
#include <experimental/optional>
|
#include <experimental/optional>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////
|
||||||
|
// for #4804
|
||||||
|
/////////////////////////////////////////////////////////////////////
|
||||||
|
using json_4804 = nlohmann::basic_json<std::map, // ObjectType
|
||||||
|
std::vector, // ArrayType
|
||||||
|
std::string, // StringType
|
||||||
|
bool, // BooleanType
|
||||||
|
std::int64_t, // NumberIntegerType
|
||||||
|
std::uint64_t, // NumberUnsignedType
|
||||||
|
double, // NumberFloatType
|
||||||
|
std::allocator, // AllocatorType
|
||||||
|
nlohmann::adl_serializer, // JSONSerializer
|
||||||
|
std::vector<std::byte>, // BinaryType
|
||||||
|
void // CustomBaseClass
|
||||||
|
>;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if JSON_HAS_RANGES == 1
|
#if JSON_HAS_RANGES == 1
|
||||||
|
|||||||
Reference in New Issue
Block a user