Merge branch 'develop' into claude/fix-allocation-exception-safety

Browse Source

include/nlohmann/json.hpp conflicted in update(const_iterator, const_iterator, bool):
kept develop's prepare_update() helper, which already creates the object
before setting its type (the same fix this branch makes elsewhere).
single_include/nlohmann/json.hpp was regenerated via `make amalgamate`
instead of being hand-resolved.

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

...

This commit is contained in:

Niels Lohmann

2026-10-01 08:53:14 +02:00

parent ba6bf32f6d e400780533

commit 362a902170

357 changed files with 12069 additions and 15746 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

include/nlohmann/json.hpp

+873 -385

File diff suppressed because it is too large Load Diff