Scarfski/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-10 19:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,461 Commits 57 Branches 57 Tags
43dc013faa50fadc2d6f8769369dd958548aa7df
Commit Graph

5461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Niels Lohmann
14be5361ea Merge branch 'json-view/19-edit-set' into json-view/21-images 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 02:01:49 +02:00
Niels Lohmann
9144cd7bf0 Merge branch 'json-view/16-view-simd' into json-view/19-edit-set 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:50:10 +02:00
Niels Lohmann
525787a2f7 Avoid GCC useless-cast and strict-overflow warnings in unit-json_view.cpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:46:20 +02:00
Niels Lohmann
7de40707dd Merge branch 'json-view/13-view-dump' into json-view/16-view-simd 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:41:21 +02:00
Niels Lohmann
dd3d73a60b Merge branch 'json-view/11-view-access' into json-view/13-view-dump 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:38:19 +02:00
Niels Lohmann
2d5d1ec7a8 Merge branch 'json-view/08-view-builder' into json-view/11-view-access 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:36:09 +02:00
Niels Lohmann
48a1363551 Merge branch 'json-view/23-zmij' into json-view/08-view-builder 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:34:31 +02:00
Niels Lohmann
b5c8e57476 Merge branch 'json-view/02b-float-parser' into json-view/23-zmij 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:33:40 +02:00
Niels Lohmann
48a69ef01d Merge branch 'develop' into json-view/02b-float-parser 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:32:41 +02:00
Niels Lohmann
8e3b878e36 Regenerate the amalgamated headers 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:28:07 +02:00
Niels Lohmann
b8ed96103c Fix clang-tidy 22 findings in unit-to_chars.cpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:28:04 +02:00
Niels Lohmann
db7fa4670c Avoid useless casts of header fields in the image tests 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
(cherry picked from commit 0238cf0a3a)
 2026-10-10 01:26:57 +02:00
Niels Lohmann
b3c9deebb7 Fix clang-tidy 22 findings in unit-json_view_image.cpp and image.hpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
(cherry picked from commit 611faf2c88)
 2026-10-10 01:26:37 +02:00
Niels Lohmann
43ee476648 Fix clang-tidy 22 findings in unit-json_view_edit.cpp and edit.hpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
(cherry picked from commit cd435ea5d3)
 2026-10-10 01:26:36 +02:00
Niels Lohmann
5ae4d58659 Fix clang-tidy 22 findings in the json_view headers 
Silence bugprone-casting-through-void for the SSE loads (a reinterpret_cast
would trip -Wcast-align=strict), use auto for a cast initialiser, add
parentheses to a mixed expression, and name bugprone-std-namespace-modification
in the NOLINTs of the tuple_size/tuple_element specialisations.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
(cherry picked from commit 0effbaa7a2)
 2026-10-10 01:26:35 +02:00
Niels Lohmann
ccd2693623 Regenerate the amalgamated headers 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:26:31 +02:00
Niels Lohmann
611faf2c88 Fix clang-tidy 22 findings in unit-json_view_image.cpp and image.hpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:26:28 +02:00
Niels Lohmann
4567351261 Fix clang-tidy 22 findings in unit-json_view_edit.cpp and edit.hpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
(cherry picked from commit cd435ea5d3)
 2026-10-10 01:24:49 +02:00
Niels Lohmann
16963863e2 Fix clang-tidy 22 findings in the json_view headers 
Silence bugprone-casting-through-void for the SSE loads (a reinterpret_cast
would trip -Wcast-align=strict), use auto for a cast initialiser, add
parentheses to a mixed expression, and name bugprone-std-namespace-modification
in the NOLINTs of the tuple_size/tuple_element specialisations.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
(cherry picked from commit 0effbaa7a2)
 2026-10-10 01:24:48 +02:00
Niels Lohmann
dee4be88d6 Regenerate the amalgamated headers 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:24:42 +02:00
Niels Lohmann
cd435ea5d3 Fix clang-tidy 22 findings in unit-json_view_edit.cpp and edit.hpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:24:40 +02:00
Niels Lohmann
558527941a Fix clang-tidy 22 findings in the json_view headers 
Silence bugprone-casting-through-void for the SSE loads (a reinterpret_cast
would trip -Wcast-align=strict), use auto for a cast initialiser, add
parentheses to a mixed expression, and name bugprone-std-namespace-modification
in the NOLINTs of the tuple_size/tuple_element specialisations.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
(cherry picked from commit 0effbaa7a2)
 2026-10-10 01:23:31 +02:00
Niels Lohmann
efcbab2cf3 Fix clang-tidy 22 findings in unit-class_lexer.cpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:23:25 +02:00
Niels Lohmann
486ab856d9 Regenerate the amalgamated headers 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:22:41 +02:00
Niels Lohmann
d81b534bb2 Fix clang-tidy 22 findings in unit-json_view.cpp and unit-json_view_builder.cpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:21:22 +02:00
Niels Lohmann
0effbaa7a2 Fix clang-tidy 22 findings in the json_view headers 
Silence bugprone-casting-through-void for the SSE loads (a reinterpret_cast
would trip -Wcast-align=strict), use auto for a cast initialiser, add
parentheses to a mixed expression, and name bugprone-std-namespace-modification
in the NOLINTs of the tuple_size/tuple_element specialisations.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 01:19:05 +02:00
Niels Lohmann
81ead20445 Annotate intentional patterns in unit-json_view.cpp for clang-tidy 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 00:19:40 +02:00
Niels Lohmann
38e34eb960 Regenerate the amalgamated headers 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 00:18:21 +02:00
Niels Lohmann
a92a9d7a48 Fix clang-tidy findings in unit-json_view_builder.cpp 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 00:18:17 +02:00
Niels Lohmann
2f94d7b950 Give document_data a user-provided constructor 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 00:18:16 +02:00
Niels Lohmann
b7f0de016f Regenerate the amalgamated headers 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 00:13:01 +02:00
Niels Lohmann
a9ef628eb4 Fix the clang-tidy 22 findings in json_view and its tests 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 00:12:52 +02:00
Niels Lohmann
0238cf0a3a Avoid useless casts of header fields in the image tests 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 00:09:36 +02:00
Niels Lohmann
74aefc3486 Move custom object key tests out of unit-cbor.cpp and unit-msgpack.cpp (#5798) 
The custom object key tests from #5328 instantiate a second basic_json
specialization in unit-cbor.cpp and unit-msgpack.cpp. This pushed
unit-msgpack.cpp.obj past 65535 sections in the clang (MinGW) jobs of
the Windows workflow, and linking test-msgpack_cpp11 fails with
"relocation truncated to fit: IMAGE_REL_AMD64_REL32 against `.rdata'".

The GNU linker keeps the section an associative COMDAT section belongs
to in 16 bits (x_associated in include/coff/internal.h), although big
object files store 32 bits. In larger objects it therefore ties the
jump tables of inline functions to the wrong function and discards them
together with that function's duplicate.

Move the four tests unchanged into unit-custom-object-key-type.cpp and
document the limit in windows.yml.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-10 00:05:02 +02:00
Niels Lohmann
5f12b148d4 Merge branch 'json-view/22-view-dump-fast' into json-view/15-view-bench 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
 2026-10-09 23:55:41 +02:00