Skip to content

Commit

Permalink
Merge pull request Laupetin#332 from Laupetin/dependabot/submodules/t…
Browse files Browse the repository at this point in the history
…hirdparty/json-60c4875

chore(deps): bump thirdparty/json from `6be4e85` to `60c4875`
  • Loading branch information
Laupetin authored Jan 4, 2025
2 parents dbecafd + 3ef65f7 commit 16e82f6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion thirdparty/json
Submodule json updated 37 files
+0 −84 .clang-format
+0 −1 .clang-tidy
+5 −0 .github/dependabot.yml
+4 −9 .github/workflows/check_amalgamation.yml
+8 −14 .github/workflows/ubuntu.yml
+3 −1 .gitignore
+9 −21 Makefile
+21 −10 cmake/ci.cmake
+2 −2 docs/examples/json_base_class_t.cpp
+2 −0 docs/mkdocs/mkdocs.yml
+1 −2 include/nlohmann/detail/conversions/from_json.hpp
+4 −3 include/nlohmann/detail/conversions/to_json.hpp
+11 −11 include/nlohmann/detail/input/binary_reader.hpp
+11 −6 include/nlohmann/detail/input/json_sax.hpp
+2 −2 include/nlohmann/detail/input/parser.hpp
+1 −1 include/nlohmann/detail/iterators/iteration_proxy.hpp
+1 −1 include/nlohmann/detail/iterators/iterator_traits.hpp
+24 −4 include/nlohmann/detail/macro_scope.hpp
+12 −12 include/nlohmann/detail/meta/type_traits.hpp
+5 −5 include/nlohmann/json.hpp
+2 −2 include/nlohmann/ordered_map.hpp
+80 −55 single_include/nlohmann/json.hpp
+4 −0 tests/abi/config/default.cpp
+4 −0 tests/abi/config/noversion.cpp
+8 −8 tests/src/unit-alt-string.cpp
+7 −7 tests/src/unit-bjdata.cpp
+7 −7 tests/src/unit-cbor.cpp
+2 −2 tests/src/unit-class_parser.cpp
+2 −2 tests/src/unit-class_parser_diagnostic_positions.cpp
+0 −2 tests/src/unit-conversions.cpp
+3 −3 tests/src/unit-custom-base-class.cpp
+4 −5 tests/src/unit-deserialization.cpp
+5 −5 tests/src/unit-msgpack.cpp
+8 −8 tests/src/unit-regression1.cpp
+7 −0 tests/src/unit-udt_macro.cpp
+80 −0 tools/astyle/.astylerc
+1 −0 tools/astyle/requirements.txt

0 comments on commit 16e82f6

Please sign in to comment.