Merge branch 'develop' into claude/ordered-json-emplace-lvalue-5673

Browse Source

Conflicts:
- include/nlohmann/ordered_map.hpp: both emplace() overloads call
  develop's new append() helper (#5609) with the PR's std::forward<V>(t)
- single_include/nlohmann/json.hpp: regenerated with make amalgamate

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

...

This commit is contained in:

Niels Lohmann committed 2026-09-30 20:32:57 +02:00

2 parents 1daad8efe0 6a073dbae4

commit 286294739a

80 files changed

+4872 -641

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

+1230 -296

File diff suppressed because it is too large. Load diff