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 92 files
+4 −0 .github/dependabot.yml
+34 −14 .github/workflows/check_amalgamation.yml
+1 −1 .github/workflows/cifuzz.yml
+4 −4 .github/workflows/codeql-analysis.yml
+32 −6 .github/workflows/comment_check_amalgamation.yml
+1 −1 .github/workflows/dependency-review.yml
+2 −2 .github/workflows/flawfinder.yml
+1 −1 .github/workflows/labeler.yml
+1 −1 .github/workflows/publish_documentation.yml
+2 −2 .github/workflows/scorecards.yml
+19 −8 .github/workflows/semgrep.yml
+1 −1 .github/workflows/stale.yml
+28 −4 .github/workflows/ubuntu.yml
+62 −0 .github/workflows/windows.yml
+4 −0 .reuse/dep5
+42 −0 cmake/ci.cmake
+1 −0 docs/mkdocs/docs/api/basic_json/array.md
+1 −0 docs/mkdocs/docs/api/basic_json/dump.md
+1 −0 docs/mkdocs/docs/api/basic_json/emplace.md
+1 −0 docs/mkdocs/docs/api/basic_json/emplace_back.md
+1 −0 docs/mkdocs/docs/api/basic_json/erase.md
+95 −0 docs/mkdocs/docs/api/basic_json/format_as.md
+1 −0 docs/mkdocs/docs/api/basic_json/get.md
+1 −0 docs/mkdocs/docs/api/basic_json/get_to.md
+2 −0 docs/mkdocs/docs/api/basic_json/index.md
+1 −0 docs/mkdocs/docs/api/basic_json/object.md
+1 −0 docs/mkdocs/docs/api/basic_json/operator_ValueType.md
+4 −0 docs/mkdocs/docs/api/basic_json/patch.md
+4 −0 docs/mkdocs/docs/api/basic_json/patch_inplace.md
+1 −0 docs/mkdocs/docs/api/basic_json/push_back.md
+57 −0 docs/mkdocs/docs/api/basic_json/std_formatter.md
+1 −0 docs/mkdocs/docs/api/basic_json/to_string.md
+1 −0 docs/mkdocs/docs/api/basic_json/update.md
+7 −3 docs/mkdocs/docs/api/basic_json/value.md
+1 −0 docs/mkdocs/docs/api/macros/index.md
+41 −0 docs/mkdocs/docs/api/macros/json_has_std_format.md
+4 −0 docs/mkdocs/docs/api/operator_literal_json.md
+6 −0 docs/mkdocs/docs/api/operator_ltlt.md
+5 −0 docs/mkdocs/docs/community/quality_assurance.md
+16 −0 docs/mkdocs/docs/examples/format_as.cpp
+1 −0 docs/mkdocs/docs/examples/format_as.output
+22 −0 docs/mkdocs/docs/examples/std_formatter.c++20.cpp
+16 −0 docs/mkdocs/docs/examples/std_formatter.c++20.output
+2 −2 docs/mkdocs/docs/features/arbitrary_types.md
+1 −1 docs/mkdocs/docs/features/assertions.md
+2 −2 docs/mkdocs/docs/features/binary_formats/bjdata.md
+23 −22 docs/mkdocs/docs/features/binary_formats/bson.md
+5 −5 docs/mkdocs/docs/features/binary_formats/cbor.md
+1 −1 docs/mkdocs/docs/features/binary_formats/index.md
+9 −9 docs/mkdocs/docs/features/binary_values.md
+91 −0 docs/mkdocs/docs/features/conversions.md
+103 −0 docs/mkdocs/docs/features/creating_values.md
+2 −2 docs/mkdocs/docs/features/element_access/checked_access.md
+3 −2 docs/mkdocs/docs/features/element_access/default_value.md
+53 −0 docs/mkdocs/docs/features/index.md
+1 −1 docs/mkdocs/docs/features/iterators.md
+1 −1 docs/mkdocs/docs/features/json_patch.md
+77 −0 docs/mkdocs/docs/features/modifying_values.md
+2 −1 docs/mkdocs/docs/features/namespace.md
+3 −3 docs/mkdocs/docs/features/object_order.md
+52 −4 docs/mkdocs/docs/features/parsing/index.md
+129 −0 docs/mkdocs/docs/features/serialization.md
+1 −1 docs/mkdocs/docs/features/types/index.md
+6 −6 docs/mkdocs/docs/features/types/number_handling.md
+14 −0 docs/mkdocs/docs/home/exceptions.md
+25 −0 docs/mkdocs/docs/home/faq.md
+11 −3 docs/mkdocs/mkdocs.yml
+61 −24 include/nlohmann/detail/input/binary_reader.hpp
+71 −3 include/nlohmann/detail/input/input_adapters.hpp
+100 −7 include/nlohmann/detail/input/lexer.hpp
+15 −3 include/nlohmann/detail/json_custom_base_class.hpp
+92 −4 include/nlohmann/detail/json_pointer.hpp
+8 −0 include/nlohmann/detail/macro_scope.hpp
+1 −0 include/nlohmann/detail/macro_unscope.hpp
+1 −1 include/nlohmann/detail/meta/cpp_future.hpp
+4 −2 include/nlohmann/detail/output/binary_writer.hpp
+116 −27 include/nlohmann/json.hpp
+469 −71 single_include/nlohmann/json.hpp
+15 −0 tests/CMakeLists.txt
+22 −0 tests/fmt_formatter/CMakeLists.txt
+36 −0 tests/fmt_formatter/project/CMakeLists.txt
+94 −0 tests/fmt_formatter/project/main.cpp
+1 −1 tests/module_cpp20/main.cpp
+4 −1 tests/src/unit-algorithms.cpp
+40 −0 tests/src/unit-cbor.cpp
+113 −0 tests/src/unit-class_parser.cpp
+10 −0 tests/src/unit-diagnostic-positions.cpp
+49 −8 tests/src/unit-element_access2.cpp
+86 −0 tests/src/unit-format-as.cpp
+54 −0 tests/src/unit-json_patch.cpp
+106 −0 tests/src/unit-regression2.cpp
+96 −0 tests/src/unit-std-format.cpp