Niels Lohmann 0d2d20560b Merge branch 'develop' into techdebt/5715-ci-cleanup ...

Conflicts:
- Makefile: pretty formats both develop's json_literals.hpp and this branch's docs/mkdocs/docs/examples/*.hpp
- cmake/ci.cmake: ci_test_amalgamation checks both develop's json_literals.hpp and this branch's BUILD.bazel
- include/nlohmann/json.hpp: kept <set> (this branch) and <stdexcept> (develop); took develop's move of the global UDLs to json_literals.hpp and kept this branch's IWYU pragma/comment on macro_unscope.hpp
- include/nlohmann/ordered_map.hpp: took develop's includes (<tuple>, updated comments) with this branch's <new> instead of <memory>
- single_include/nlohmann/json.hpp: regenerated with make amalgamate

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

2026-09-30 20:38:16 +02:00

..

amalgamate

Keep external headers as #include when amalgamating (#5615)

2026-09-30 20:05:51 +02:00

astyle

Stop Dependabot from proposing astyle bumps

2026-09-30 09:52:51 +02:00

gdb_pretty_printer

fixes issue 4691 (#4693)

2025-03-18 14:01:25 +01:00

generate_natvis

Make JSON_STRICT_NUL_HANDLING part of the ABI tag (#5560)

2026-09-25 21:54:11 +02:00

macro_builder

Reorganize directories (#3462)

2022-05-01 09:41:50 +02:00

serve_header

Make serve_header.py listen on localhost and limit its CORS header (#5564)

2026-09-24 17:02:39 +02:00