json/include/nlohmann at 6ffc69c6dc09016f4ecc900fe5257a92715400d2 - json

mirror of https://github.com/nlohmann/json.git synced 2026-09-11 10:48:01 +00:00

Files

T

Niels Lohmann 6ffc69c6dc Merge branch 'fix/parser-callback-duplicate-key' into fix/allow-exceptions-408

Resolve conflicts from the duplicate-key-stash fix landing on the base branch:
- include/nlohmann/detail/input/json_sax.hpp: take the base branch's already-
  merged remove_discarded_value()/resolve_duplicate_key_stash() implementation
  wholesale; this branch's own change (JSON_THROW -> return parse_error(...)
  for excessive object/array size, honoring allow_exceptions=false) applied
  cleanly elsewhere in the same file.
- tests/src/unit-regression2.cpp / unit-regression3.cpp: the 3-way merge
  duplicated the "duplicate key" test case into both files and appended this
  branch's new "excessive binary container size" test to the now-superseded
  unit-regression2.cpp; keep unit-regression2.cpp as already split and append
  only the genuinely new test to the end of unit-regression3.cpp.

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

2026-09-11 10:34:56 +02:00

detail

Merge branch 'fix/parser-callback-duplicate-key' into fix/allow-exceptions-408

2026-09-11 10:34:56 +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 )