Niels Lohmann a059e39662 Merge branch 'develop' into claude/abi-tag-strict-nul-handling ...

Resolve the conflict with #5344, which added the _psp ABI tag: _snul now
follows _psp, NLOHMANN_JSON_ABI_TAGS_CONCAT takes six tags, and
nlohmann_json.natvis and the amalgamation are regenerated.

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

2026-09-25 18:09:46 +02:00

..

abi

Merge branch 'develop' into claude/abi-tag-strict-nul-handling

2026-09-25 18:09:46 +02:00

benchmarks

Add benchmarks for the binary readers (#5510)

2026-09-11 13:15:09 +02:00

cmake_add_subdirectory

📄 adjust year (#5044)

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

cmake_fetch_content

📄 adjust year (#5044)

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

cmake_fetch_content2

📄 adjust year (#5044)

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

cmake_import

📄 adjust year (#5044)

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

cmake_import_minver

📄 adjust year (#5044)

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

cmake_target_include_directories

📄 adjust year (#5044)

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

cuda_example

Fix nvcc CUDA 12.0/12.1 C++20 ranges parse error (#3907) (#5248)

2026-07-09 19:02:36 +02:00

fmt_formatter

Add std::format and fmt support (#5224)

2026-07-02 15:59:36 +02:00

module_cpp20

Extend value to arrays when using JSON pointers (#5223)

2026-07-02 06:35:35 +02:00

reports

Reorganize directories (#3462)

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

src

Merge branch 'develop' into claude/abi-tag-strict-nul-handling

2026-09-25 18:09:46 +02:00

thirdparty

Adjust warnings flags (#4801)

2025-05-31 17:48:34 +02:00

CMakeLists.txt

Fix CI: disable MSVC warning C5285 for the vendored doctest (#5577)

2026-09-25 17:54:40 +02:00

fuzzing.md

Check the fuzzers' UBJSON/BJData round-trip invariants in the unit tests (#5569)

2026-09-25 08:29:02 +02:00

Makefile

Reorganize directories (#3462)

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