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 61 files
+2 −2 .github/workflows/check_amalgamation.yml
+1 −1 .github/workflows/cifuzz.yml
+4 −4 .github/workflows/codeql-analysis.yml
+1 −1 .github/workflows/comment_check_amalgamation.yml
+1 −1 .github/workflows/dependency-review.yml
+3 −3 .github/workflows/flawfinder.yml
+1 −1 .github/workflows/labeler.yml
+2 −2 .github/workflows/publish_documentation.yml
+2 −2 .github/workflows/scorecards.yml
+2 −2 .github/workflows/semgrep.yml
+1 −1 .github/workflows/stale.yml
+4 −4 .github/workflows/ubuntu.yml
+33 −3 README.md
+1 −1 cmake/requirements/requirements-cppcheck.txt
+37 −0 docs/mkdocs/docs/api/json_pointer/front.md
+3 −0 docs/mkdocs/docs/api/json_pointer/index.md
+33 −0 docs/mkdocs/docs/api/json_pointer/pop_front.md
+36 −0 docs/mkdocs/docs/api/json_pointer/push_front.md
+26 −0 docs/mkdocs/docs/api/macros/index.md
+1 −1 docs/mkdocs/docs/api/macros/nlohmann_define_derived_type.md
+3 −3 docs/mkdocs/docs/api/macros/nlohmann_define_type_intrusive.md
+3 −3 docs/mkdocs/docs/api/macros/nlohmann_define_type_non_intrusive.md
+78 −0 docs/mkdocs/docs/api/macros/nlohmann_define_type_with_names.md
+1 −0 docs/mkdocs/docs/api/macros/nlohmann_json_serialize_enum.md
+102 −0 docs/mkdocs/docs/api/macros/nlohmann_json_serialize_enum_strict.md
+15 −0 docs/mkdocs/docs/examples/json_pointer__front.cpp
+2 −0 docs/mkdocs/docs/examples/json_pointer__front.output
+21 −0 docs/mkdocs/docs/examples/json_pointer__pop_front.cpp
+4 −0 docs/mkdocs/docs/examples/json_pointer__pop_front.output
+21 −0 docs/mkdocs/docs/examples/json_pointer__push_front.cpp
+4 −0 docs/mkdocs/docs/examples/json_pointer__push_front.output
+55 −0 docs/mkdocs/docs/examples/nlohmann_define_type_non_intrusive_with_names_explicit.cpp
+2 −0 docs/mkdocs/docs/examples/nlohmann_define_type_non_intrusive_with_names_explicit.output
+41 −0 docs/mkdocs/docs/examples/nlohmann_define_type_non_intrusive_with_names_macro.cpp
+2 −0 docs/mkdocs/docs/examples/nlohmann_define_type_non_intrusive_with_names_macro.output
+52 −0 docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict.cpp
+2 −0 docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict.output
+33 −0 docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict_2.cpp
+3 −0 docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict_2.output
+53 −0 docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict_err.cpp
+2 −0 docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict_err.output
+46 −13 docs/mkdocs/docs/features/arbitrary_types.md
+2 −1 docs/mkdocs/docs/features/enum_conversion.md
+10 −0 docs/mkdocs/docs/home/exceptions.md
+5 −0 docs/mkdocs/mkdocs.yml
+1 −1 docs/mkdocs/requirements.txt
+3 −7 include/nlohmann/detail/conversions/from_json.hpp
+38 −0 include/nlohmann/detail/json_pointer.hpp
+222 −40 include/nlohmann/detail/macro_scope.hpp
+15 −2 include/nlohmann/detail/output/serializer.hpp
+17 −2 include/nlohmann/json.hpp
+33 −0 include/nlohmann/ordered_map.hpp
+328 −51 single_include/nlohmann/json.hpp
+9 −7 src/modules/json.cppm
+79 −1 tests/src/unit-conversions.cpp
+19 −2 tests/src/unit-json_pointer.cpp
+12 −0 tests/src/unit-ordered_json.cpp
+5 −0 tests/src/unit-ordered_map.cpp
+89 −0 tests/src/unit-regression2.cpp
+85 −0 tests/src/unit-serialization.cpp
+496 −12 tests/src/unit-udt_macro.cpp