Niels Lohmann 362a902170 Merge branch 'develop' into claude/fix-allocation-exception-safety ...

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>

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

..

detail

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

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

thirdparty/hedley

Undefine the four JSON_HEDLEY_* macros that leak after including json.hpp (#5475)

2026-09-09 09:48:17 +02:00

adl_serializer.hpp

📄 adjust year (#5044)

2026-01-01 20:00:39 +01:00

byte_container_with_subtype.hpp

📄 adjust year (#5044)

2026-01-01 20:00:39 +01:00

json_fwd.hpp

Fix CI jobs that check less than they claim; move arm64 to GitHub (#5733)

2026-09-30 22:49:24 +02:00

json_literals.hpp

Move the user-defined string literals to <nlohmann/json_literals.hpp> and add JSON_NO_AUTOMATIC_UDLS (#5610)

2026-09-30 20:08:17 +02:00

json.hpp

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

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

ordered_map.hpp

Fix CI jobs that check less than they claim; move arm64 to GitHub (#5733)

2026-09-30 22:49:24 +02:00