Merge develop into #5901 and fix clang-tidy else-after-return

Browse Source

Resolve the json_sax.hpp conflicts (keep the shared error state next to the
object key index; the binary parser uses the shared error state as well) and
drop the else after return in the diff stack-frame code.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>

...

This commit is contained in:

Niels Lohmann committed 2026-10-24 15:36:09 +02:00

2 parents 6ee6351361 9c50bdd140

commit 89b762aa35

28 files changed

+4848 -804

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

No files matched your search

single_include/nlohmann/json_view.hpp

Generated

+847 -339

File diff suppressed because it is too large. Load diff