mirror of
https://github.com/nlohmann/json.git
synced 2026-11-19 17:55:20 +00:00
Merge branch 'develop' into fix/5420-swap-diagnostic-positions
Resolves the modify/delete conflict on tests/src/unit-class_parser_diagnostic_positions.cpp: develop (#5474) deleted this file, folding its content into unit-class_parser.cpp under an #if JSON_DIAGNOSTIC_POSITIONS guard that is recompiled as a separate CTest binary. Accept that deletion and port this branch's new TEST_CASE("diagnostic positions: value lifetime") into unit-class_parser.cpp instead, guarded the same way. The basic_json::swap() fix in include/nlohmann/json.hpp (and its single_include copy) merges cleanly with no conflict. Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
74 files changed
+10013
-4232
No files matched your search
+3055
-636
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user