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

..

nlohmann

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

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