amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-05 14:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into claude/abi-tag-strict-nul-handling

Browse Source 
Resolve the conflict with #5344, which added the _psp ABI tag: _snul now
follows _psp, NLOHMANN_JSON_ABI_TAGS_CONCAT takes six tags, and
nlohmann_json.natvis and the amalgamation are regenerated.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-25 18:09:46 +02:00
parent 2a60c975bc 465407f3ce
commit a059e39662
55 changed files with 5380 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/macro_unscope.hpp
+1
View File
@@ -44,6 +44,7 @@
#undef JSON_HAS_STATIC_RTTI
#undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
#undef JSON_BRACE_INIT_COPY_SEMANTICS
#undef JSON_PRECISE_STREAM_POSITION
#undef JSON_STRICT_NUL_HANDLING
#endif