amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-10 16:37:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,496 Commits 55 Branches 57 Tags
828f5ead342f9345ea0161b821e65e8c990e9c82
Commit Graph
5496 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann 828f5ead34 Merge branch 'json-view/22-view-dump-fast' into json-view/15-view-bench 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:20 +02:00
Niels Lohmann 5cb143638a Merge branch 'json-view/21-images' into json-view/22-view-dump-fast 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:18 +02:00
Niels Lohmann 37f68c5779 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:15 +02:00
Niels Lohmann 3ae177da4e Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:12 +02:00
Niels Lohmann 4bc402ecc1 Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:10 +02:00
Niels Lohmann f4c1211251 Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:08 +02:00
Niels Lohmann a2c9c260ad Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:05 +02:00
Niels Lohmann 75472d6e40 Trigger a new mergeability check of the json_view pull requests 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:47:03 +02:00
Niels Lohmann 5062800d41 Merge branch 'json-view/22-view-dump-fast' into json-view/15-view-bench 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:13:02 +02:00
Niels Lohmann 47d237b2ed Merge branch 'json-view/21-images' into json-view/22-view-dump-fast 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:59 +02:00
Niels Lohmann ad4680a7a4 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:57 +02:00
Niels Lohmann efafdd3420 Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:54 +02:00
Niels Lohmann 6dd4323006 Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:52 +02:00
Niels Lohmann 5be292e0ae Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:49 +02:00
Niels Lohmann fb9be5de2f Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:47 +02:00
Niels Lohmann fcdf945eee Check the steps of the deep-nesting test separately 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 12:12:37 +02:00
Niels Lohmann d9a1b88953 Merge branch 'json-view/22-view-dump-fast' into json-view/15-view-bench 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:53:56 +02:00
Niels Lohmann bd7a232d9f Split the value and pointer edit tests off unit-json_view_edit.cpp 
The MinGW linker of the Windows clang jobs cannot link object files with more
than 32767 sections ("relocation truncated to fit: IMAGE_REL_AMD64_REL32
against `.rdata'"). unit-json_view_edit.cpp has 35409 sections since the fast
dump instantiates more code for editable documents, so its test cases "views
and values", "deeply nested values", "pointers below a null value", and
"strings of other documents are checked" move into
unit-json_view_edit_values.cpp. The helper exception_of_call() that both
files use moves into json_view_test_helpers.hpp.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:51:52 +02:00
Niels Lohmann 7ef5770d31 Merge branch 'json-view/21-images' into json-view/22-view-dump-fast 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:46:27 +02:00
Niels Lohmann 5e84bf6814 Fix the indentation of a loop in the image test 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:43:14 +02:00
Niels Lohmann 5cfafc2478 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:43:14 +02:00
Niels Lohmann 9d45c82470 Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:41:00 +02:00
Niels Lohmann 743517f996 Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:38:43 +02:00
Niels Lohmann fc0d39ca9d Split the dump and comparison tests off unit-json_view.cpp 
The MinGW linker of the Windows clang jobs cannot link object files with more
than 32767 sections ("relocation truncated to fit: IMAGE_REL_AMD64_REL32
against `.rdata'"). unit-json_view.cpp reaches that limit as the stack
grows, so its "json_view dump" and "json_view comparison" test cases move
into unit-json_view_dump.cpp. The test generator and has_duplicate_keys()
that both files use move into json_view_test_helpers.hpp.

The new file mentions JSON_HAS_CPP_17, so it is built for C++17 like the file
it was split from.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:34:42 +02:00
Niels Lohmann 90c6696641 Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:31:33 +02:00
Niels Lohmann 25b25ece96 Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:30:00 +02:00
Niels Lohmann 2f81bec10f Merge branch 'json-view/23-zmij' into json-view/08-view-builder 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:28:29 +02:00
Niels Lohmann e26967139e Merge branch 'json-view/02b-float-parser' into json-view/23-zmij 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:25:50 +02:00
Niels Lohmann 7355b090af Keep a raw string with a backslash out of a CHECK (MSVC C2017) 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:10:48 +02:00
Niels Lohmann e6f9f6b07a Fix MSVC C4244 and C2017 in the image test 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:09:24 +02:00
Niels Lohmann 1c79a536d1 Index strings with size_t in the colliding-keys test (MSVC C4244 on Win32) 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:09:16 +02:00
Niels Lohmann 571b655357 Silence MSVC C4127 for a platform-constant check in the to_chars test 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:08:03 +02:00
Niels Lohmann 3caf0e7cdb Mark the unsigned long of the MSVC bit scans for cpplint 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:07:53 +02:00
Niels Lohmann 1550cdf6c4 Merge branch 'json-view/22-view-dump-fast' into json-view/15-view-bench 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:05:15 +02:00
Niels Lohmann d339a714ce Write doubles from their bits only where double is IEEE 754 binary64 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 11:05:12 +02:00
Niels Lohmann 43dc013faa Merge branch 'json-view/22-view-dump-fast' into json-view/15-view-bench 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:46:52 +02:00
Niels Lohmann 749ba78543 Merge branch 'json-view/21-images' into json-view/22-view-dump-fast 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:21 +02:00
Niels Lohmann c8ab9bf991 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:18 +02:00
Niels Lohmann 679672c9af Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:14 +02:00
Niels Lohmann a241f67eb1 Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:12 +02:00
Niels Lohmann bae4148a78 Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:09 +02:00
Niels Lohmann 8d3272e93b Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:44:06 +02:00
Niels Lohmann 7ee91c7d91 Suppress Flawfinder's read() finding on the deleted overload 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:43:48 +02:00
Niels Lohmann 752a891bb2 Merge branch 'json-view/22-view-dump-fast' into json-view/15-view-bench 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:40:26 +02:00
Niels Lohmann 38bdb36f7f Merge branch 'json-view/21-images' into json-view/22-view-dump-fast 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:32:18 +02:00
Niels Lohmann 98c5e8b994 Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:24:42 +02:00
Niels Lohmann 5f54533da3 Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:21:20 +02:00
Niels Lohmann 43624a81fa Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:17:51 +02:00
Niels Lohmann 23ade0e9f9 Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:14:55 +02:00
Niels Lohmann c2810ffe3d Avoid GCC useless-cast warnings in the integer index tests 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:11:49 +02:00