Merge develop into perf/view-compare

Browse Source

Resolves the conflict in unit-json_view_image.cpp, where develop (#5889)
and this branch each added a section to "json_view images: errors": both
are kept. single_include is a fresh amalgamation.

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

...

This commit is contained in:

Niels Lohmann committed 2026-10-24 07:48:54 +02:00

2 parents 70d1baa57a 9c50bdd140

commit 6775994761

48 files changed

+11884 -1948

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.hpp

Generated

+4400 -643

File diff suppressed because it is too large. Load diff

single_include/nlohmann/json_view.hpp

Generated

+847 -339

File diff suppressed because it is too large. Load diff