From 1ad1077ebd9c50f18379614f7f407b37d076d767 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 18 Oct 2026 10:50:28 +0200 Subject: [PATCH] Regenerate the amalgamated headers Signed-off-by: Niels Lohmann --- single_include/nlohmann/json.hpp | 22 +++++++++++--- single_include/nlohmann/json_fwd.hpp | 22 +++++++++++--- single_include/nlohmann/json_view.hpp | 44 ++++++++++++++++++++++++--- 3 files changed, 76 insertions(+), 12 deletions(-) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index bbcb17dcf..a12fdb632 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -186,14 +186,26 @@ #define NLOHMANN_JSON_ABI_TAG_DISABLE_UNLOCKED_FILE_IO #endif +#ifdef JSON_VIEW_NO_SIMD + #define NLOHMANN_JSON_ABI_TAG_VIEW_NO_SIMD _vns +#else + #define NLOHMANN_JSON_ABI_TAG_VIEW_NO_SIMD +#endif + +#ifdef JSON_VIEW_USE_SSSE3 + #define NLOHMANN_JSON_ABI_TAG_VIEW_USE_SSSE3 _vssse3 +#else + #define NLOHMANN_JSON_ABI_TAG_VIEW_USE_SSSE3 +#endif + #ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0 #endif // Construct the namespace ABI tags component -#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j) json_abi ## a ## b ## c ## d ## e ## f ## g ## h ## i ## j -#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c, d, e, f, g, h, i, j) \ - NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j) +#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j, k, l) json_abi ## a ## b ## c ## d ## e ## f ## g ## h ## i ## j ## k ## l +#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c, d, e, f, g, h, i, j, k, l) \ + NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j, k, l) #define NLOHMANN_JSON_ABI_TAGS \ NLOHMANN_JSON_ABI_TAGS_CONCAT( \ @@ -206,7 +218,9 @@ NLOHMANN_JSON_ABI_TAG_STRICT_BINARY_UTF8, \ NLOHMANN_JSON_ABI_TAG_OBJECTS_FOR_ENUM_KEYED_MAPS, \ NLOHMANN_JSON_ABI_TAG_DISABLE_STREAM_BULK_SCAN, \ - NLOHMANN_JSON_ABI_TAG_DISABLE_UNLOCKED_FILE_IO) + NLOHMANN_JSON_ABI_TAG_DISABLE_UNLOCKED_FILE_IO, \ + NLOHMANN_JSON_ABI_TAG_VIEW_NO_SIMD, \ + NLOHMANN_JSON_ABI_TAG_VIEW_USE_SSSE3) // Construct the namespace version component #define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \ diff --git a/single_include/nlohmann/json_fwd.hpp b/single_include/nlohmann/json_fwd.hpp index f9ac88b06..af9ad56a7 100644 --- a/single_include/nlohmann/json_fwd.hpp +++ b/single_include/nlohmann/json_fwd.hpp @@ -139,14 +139,26 @@ #define NLOHMANN_JSON_ABI_TAG_DISABLE_UNLOCKED_FILE_IO #endif +#ifdef JSON_VIEW_NO_SIMD + #define NLOHMANN_JSON_ABI_TAG_VIEW_NO_SIMD _vns +#else + #define NLOHMANN_JSON_ABI_TAG_VIEW_NO_SIMD +#endif + +#ifdef JSON_VIEW_USE_SSSE3 + #define NLOHMANN_JSON_ABI_TAG_VIEW_USE_SSSE3 _vssse3 +#else + #define NLOHMANN_JSON_ABI_TAG_VIEW_USE_SSSE3 +#endif + #ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0 #endif // Construct the namespace ABI tags component -#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j) json_abi ## a ## b ## c ## d ## e ## f ## g ## h ## i ## j -#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c, d, e, f, g, h, i, j) \ - NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j) +#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j, k, l) json_abi ## a ## b ## c ## d ## e ## f ## g ## h ## i ## j ## k ## l +#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c, d, e, f, g, h, i, j, k, l) \ + NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j, k, l) #define NLOHMANN_JSON_ABI_TAGS \ NLOHMANN_JSON_ABI_TAGS_CONCAT( \ @@ -159,7 +171,9 @@ NLOHMANN_JSON_ABI_TAG_STRICT_BINARY_UTF8, \ NLOHMANN_JSON_ABI_TAG_OBJECTS_FOR_ENUM_KEYED_MAPS, \ NLOHMANN_JSON_ABI_TAG_DISABLE_STREAM_BULK_SCAN, \ - NLOHMANN_JSON_ABI_TAG_DISABLE_UNLOCKED_FILE_IO) + NLOHMANN_JSON_ABI_TAG_DISABLE_UNLOCKED_FILE_IO, \ + NLOHMANN_JSON_ABI_TAG_VIEW_NO_SIMD, \ + NLOHMANN_JSON_ABI_TAG_VIEW_USE_SSSE3) // Construct the namespace version component #define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \ diff --git a/single_include/nlohmann/json_view.hpp b/single_include/nlohmann/json_view.hpp index 2e3abeb4a..ba373e7d2 100644 --- a/single_include/nlohmann/json_view.hpp +++ b/single_include/nlohmann/json_view.hpp @@ -3217,6 +3217,14 @@ NLOHMANN_JSON_NAMESPACE_END #define JSON_USE_OBJECTS_FOR_ENUM_KEYED_MAPS 0 #endif +#ifndef JSON_DISABLE_STREAM_BULK_SCAN + #define JSON_DISABLE_STREAM_BULK_SCAN 0 +#endif + +#ifndef JSON_DISABLE_UNLOCKED_FILE_IO + #define JSON_DISABLE_UNLOCKED_FILE_IO 0 +#endif + #if JSON_DIAGNOSTICS #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag #else @@ -3265,14 +3273,38 @@ NLOHMANN_JSON_NAMESPACE_END #define NLOHMANN_JSON_ABI_TAG_OBJECTS_FOR_ENUM_KEYED_MAPS #endif +#if JSON_DISABLE_STREAM_BULK_SCAN + #define NLOHMANN_JSON_ABI_TAG_DISABLE_STREAM_BULK_SCAN _dsbs +#else + #define NLOHMANN_JSON_ABI_TAG_DISABLE_STREAM_BULK_SCAN +#endif + +#if JSON_DISABLE_UNLOCKED_FILE_IO + #define NLOHMANN_JSON_ABI_TAG_DISABLE_UNLOCKED_FILE_IO _dufio +#else + #define NLOHMANN_JSON_ABI_TAG_DISABLE_UNLOCKED_FILE_IO +#endif + +#ifdef JSON_VIEW_NO_SIMD + #define NLOHMANN_JSON_ABI_TAG_VIEW_NO_SIMD _vns +#else + #define NLOHMANN_JSON_ABI_TAG_VIEW_NO_SIMD +#endif + +#ifdef JSON_VIEW_USE_SSSE3 + #define NLOHMANN_JSON_ABI_TAG_VIEW_USE_SSSE3 _vssse3 +#else + #define NLOHMANN_JSON_ABI_TAG_VIEW_USE_SSSE3 +#endif + #ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0 #endif // Construct the namespace ABI tags component -#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h) json_abi ## a ## b ## c ## d ## e ## f ## g ## h -#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c, d, e, f, g, h) \ - NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h) +#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j, k, l) json_abi ## a ## b ## c ## d ## e ## f ## g ## h ## i ## j ## k ## l +#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c, d, e, f, g, h, i, j, k, l) \ + NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c, d, e, f, g, h, i, j, k, l) #define NLOHMANN_JSON_ABI_TAGS \ NLOHMANN_JSON_ABI_TAGS_CONCAT( \ @@ -3283,7 +3315,11 @@ NLOHMANN_JSON_NAMESPACE_END NLOHMANN_JSON_ABI_TAG_PRECISE_STREAM_POSITION, \ NLOHMANN_JSON_ABI_TAG_STRICT_NUL_HANDLING, \ NLOHMANN_JSON_ABI_TAG_STRICT_BINARY_UTF8, \ - NLOHMANN_JSON_ABI_TAG_OBJECTS_FOR_ENUM_KEYED_MAPS) + NLOHMANN_JSON_ABI_TAG_OBJECTS_FOR_ENUM_KEYED_MAPS, \ + NLOHMANN_JSON_ABI_TAG_DISABLE_STREAM_BULK_SCAN, \ + NLOHMANN_JSON_ABI_TAG_DISABLE_UNLOCKED_FILE_IO, \ + NLOHMANN_JSON_ABI_TAG_VIEW_NO_SIMD, \ + NLOHMANN_JSON_ABI_TAG_VIEW_USE_SSSE3) // Construct the namespace version component #define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \