mirror of
https://github.com/nlohmann/json.git
synced 2026-10-03 21:20:30 +00:00
Conflicts: - include/nlohmann/json.hpp: took develop's json_literals.hpp include (#5610) without the GCC C++20 -Wignored-attributes pragma pop this branch removes - single_include/nlohmann/json.hpp: regenerated with make amalgamate Also dropped the redundant semicolon from six CAPTURE() call sites that develop added in unit-allocator, unit-class_lexer, and unit-comparison, as this branch removes -Wno-extra-semi-stmt. Signed-off-by: Niels Lohmann <mail@nlohmann.me>