Merge branch 'develop' into techdebt/5725-lint-cleanup

Browse Source

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>

...

This commit is contained in:

Niels Lohmann

2026-09-30 20:41:18 +02:00

parent ebfa914346 6a073dbae4

commit 6a7416a922

80 changed files with 4872 additions and 641 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

single_include/nlohmann/json.hpp

+1230 -296

File diff suppressed because it is too large Load Diff