Merge branch 'develop' into techdebt/5710-5711-binary-formats-cleanup

Browse Source

Conflicts:
- include/nlohmann/detail/output/binary_writer.hpp: kept write_msgpack_unsigned() for both msgpack integer cases; it already reads the active union member, which is what develop's #5694 fixes in the old ladders
- single_include/nlohmann/json.hpp: regenerated with make amalgamate

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

...

This commit is contained in:

Niels Lohmann

2026-09-30 20:33:37 +02:00

parent 2610d176ef 6a073dbae4

commit b0b82e5af7

80 changed files with 4852 additions and 623 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

+1220 -287

File diff suppressed because it is too large Load Diff