Niels Lohmann 7e8e8e219b Merge remote-tracking branch 'origin/develop' into claude/fix-issue-3989-db7e45 ...

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

# Conflicts:
#	include/nlohmann/detail/input/binary_reader.hpp
#	include/nlohmann/json.hpp
#	single_include/nlohmann/json.hpp

2026-09-30 22:53:03 +02:00

..

detail

Merge remote-tracking branch 'origin/develop' into claude/fix-issue-3989-db7e45

2026-09-30 22:53:03 +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

📄 adjust year (#5044)

2026-01-01 20:00:39 +01: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 remote-tracking branch 'origin/develop' into claude/fix-issue-3989-db7e45

2026-09-30 22:53:03 +02:00

ordered_map.hpp

Move instead of deep-copy ordered_json values when an object grows (#5609)

2026-09-30 20:06:34 +02:00