Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion thirdparty/json
Submodule json updated 97 files
+12 −0 .github/dependabot.yml
+1 −1 .github/workflows/semgrep.yml
+52 −7 .github/workflows/ubuntu.yml
+6 −2 cmake/ci.cmake
+5 −3 cmake/clang_flags.cmake
+1 −1 docs/docset/docset.json
+17 −7 docs/mkdocs/docs/api/basic_json/accept.md
+28 −2 docs/mkdocs/docs/api/basic_json/basic_json.md
+40 −0 docs/mkdocs/docs/api/basic_json/binary_t.md
+1 −1 docs/mkdocs/docs/api/basic_json/format_as.md
+14 −5 docs/mkdocs/docs/api/basic_json/from_bjdata.md
+14 −5 docs/mkdocs/docs/api/basic_json/from_bson.md
+14 −5 docs/mkdocs/docs/api/basic_json/from_cbor.md
+14 −5 docs/mkdocs/docs/api/basic_json/from_msgpack.md
+14 −5 docs/mkdocs/docs/api/basic_json/from_ubjson.md
+7 −0 docs/mkdocs/docs/api/basic_json/get.md
+11 −0 docs/mkdocs/docs/api/basic_json/items.md
+11 −1 docs/mkdocs/docs/api/basic_json/object_t.md
+11 −1 docs/mkdocs/docs/api/basic_json/operator[].md
+11 −12 docs/mkdocs/docs/api/basic_json/operator_ne.md
+17 −7 docs/mkdocs/docs/api/basic_json/parse.md
+1 −1 docs/mkdocs/docs/api/basic_json/patch.md
+1 −1 docs/mkdocs/docs/api/basic_json/patch_inplace.md
+17 −8 docs/mkdocs/docs/api/basic_json/sax_parse.md
+1 −1 docs/mkdocs/docs/api/basic_json/std_formatter.md
+14 −0 docs/mkdocs/docs/api/basic_json/string_t.md
+7 −0 docs/mkdocs/docs/api/basic_json/type_name.md
+5 −1 docs/mkdocs/docs/api/basic_json/value.md
+1 −1 docs/mkdocs/docs/api/json_pointer/front.md
+1 −1 docs/mkdocs/docs/api/json_pointer/pop_front.md
+1 −1 docs/mkdocs/docs/api/json_pointer/push_front.md
+1 −1 docs/mkdocs/docs/api/macros/json_brace_init_copy_semantics.md
+2 −1 docs/mkdocs/docs/api/macros/json_diagnostics.md
+1 −1 docs/mkdocs/docs/api/macros/json_has_cpp_11.md
+14 −0 docs/mkdocs/docs/api/macros/json_has_filesystem.md
+14 −0 docs/mkdocs/docs/api/macros/json_has_ranges.md
+1 −1 docs/mkdocs/docs/api/macros/json_has_std_format.md
+3 −0 docs/mkdocs/docs/api/macros/nlohmann_define_type_intrusive.md
+3 −0 docs/mkdocs/docs/api/macros/nlohmann_define_type_non_intrusive.md
+1 −1 docs/mkdocs/docs/api/macros/nlohmann_define_type_with_names.md
+1 −1 docs/mkdocs/docs/api/macros/nlohmann_json_serialize_enum_strict.md
+12 −0 docs/mkdocs/docs/api/operator_gtgt.md
+1 −1 docs/mkdocs/docs/api/operator_literal_json.md
+1 −1 docs/mkdocs/docs/api/operator_literal_json_pointer.md
+12 −6 docs/mkdocs/docs/community/quality_assurance.md
+61 −0 docs/mkdocs/docs/examples/reject_duplicate_keys.cpp
+2 −0 docs/mkdocs/docs/examples/reject_duplicate_keys.output
+86 −0 docs/mkdocs/docs/features/arbitrary_types.md
+16 −1 docs/mkdocs/docs/features/binary_formats/cbor.md
+9 −2 docs/mkdocs/docs/features/binary_formats/messagepack.md
+1 −1 docs/mkdocs/docs/features/comments.md
+97 −0 docs/mkdocs/docs/features/conversions.md
+2 −1 docs/mkdocs/docs/features/element_access/default_value.md
+14 −0 docs/mkdocs/docs/features/element_access/unchecked_access.md
+5 −0 docs/mkdocs/docs/features/json_pointer.md
+19 −0 docs/mkdocs/docs/features/modules.md
+3 −0 docs/mkdocs/docs/features/parsing/json_lines.md
+87 −0 docs/mkdocs/docs/features/parsing/parser_callbacks.md
+13 −1 docs/mkdocs/docs/features/types/index.md
+4 −0 docs/mkdocs/docs/features/types/number_handling.md
+31 −0 docs/mkdocs/docs/home/debugging.md
+4 −1 docs/mkdocs/docs/home/exceptions.md
+24 −1 docs/mkdocs/docs/home/faq.md
+37 −0 docs/mkdocs/docs/integration/cmake.md
+9 −0 docs/mkdocs/docs/integration/package_managers.md
+4 −0 docs/mkdocs/docs/robots.txt
+25 −0 docs/mkdocs/hooks/copy_markdown_source.py
+31 −0 docs/mkdocs/mkdocs.yml
+1 −0 docs/mkdocs/requirements.txt
+21 −0 include/nlohmann/detail/conversions/from_json.hpp
+50 −3 include/nlohmann/detail/conversions/to_json.hpp
+77 −22 include/nlohmann/detail/input/input_adapters.hpp
+5 −0 include/nlohmann/detail/macro_scope.hpp
+83 −1 include/nlohmann/detail/meta/type_traits.hpp
+29 −9 include/nlohmann/detail/output/serializer.hpp
+32 −39 include/nlohmann/json.hpp
+297 −74 single_include/nlohmann/json.hpp
+5 −1 tests/CMakeLists.txt
+12 −1 tests/cuda_example/CMakeLists.txt
+16 −0 tests/cuda_example/json_cuda.cu
+13 −0 tests/src/test_utils.hpp
+3 −0 tests/src/unit-algorithms.cpp
+1 −1 tests/src/unit-allocator.cpp
+6 −8 tests/src/unit-alt-string.cpp
+9 −0 tests/src/unit-bjdata.cpp
+13 −0 tests/src/unit-bson.cpp
+9 −0 tests/src/unit-cbor.cpp
+33 −14 tests/src/unit-comparison.cpp
+1 −1 tests/src/unit-constructor1.cpp
+26 −0 tests/src/unit-convenience.cpp
+29 −4 tests/src/unit-conversions.cpp
+5 −0 tests/src/unit-deserialization.cpp
+1 −1 tests/src/unit-iterators2.cpp
+9 −0 tests/src/unit-msgpack.cpp
+77 −1 tests/src/unit-regression2.cpp
+9 −0 tests/src/unit-ubjson.cpp
+103 −0 tests/src/unit-user_defined_input.cpp