Merge remote-tracking branch 'origin/develop' into claude/issue-5387-duplicate-check-bd7853

Browse Source

Resolves conflicts from develop's binary-reader and serializer rewrites,
and the unit-regression2.cpp/unit-regression3.cpp split (#5511): took
develop's version of the split test files wholesale (content-equivalent,
confirmed by comparing SECTION/TEST_CASE names), and combined the
ci_cmake_options CI matrix (ci_test_simdutf + ci_test_no_thread_local).

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

...

This commit is contained in:

Niels Lohmann

2026-09-11 09:43:37 +02:00

parent bb1fc5eb9a 0452641c18

commit c091b7091a

36 changed files with 8436 additions and 4041 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

+2811 -610

File diff suppressed because it is too large Load Diff