json repo is update to aafad2be

0xdead4ead · Oct 21, 2018 · 2a3f0e6 · 2a3f0e6
1 parent b005246
commit 2a3f0e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,8 @@
 [submodule "extern/nlohmann/json"]
 	path = extern/nlohmann/json
-	url = git://github.com/nlohmann/json
+	url = https://github.com/nlohmann/json
+	branch = master
 [submodule "extern/nlohmann/fifo_map"]
 	path = extern/nlohmann/fifo_map
-	url = git://github.com/nlohmann/fifo_map
+	url = https://github.com/nlohmann/fifo_map
+	branch = master
diff --git a/extern/nlohmann/json b/extern/nlohmann/json
+1 −1		.github/CONTRIBUTING.md
+1 −1		.github/PULL_REQUEST_TEMPLATE.md
+12 −1		.travis.yml
+3 −4		CMakeLists.txt
+69 −2		ChangeLog.md
+4 −1		Makefile
+92 −10		README.md
+12 −2		cmake/config.cmake.in
+1 −1		doc/Doxyfile
+ −		doc/avatars.png
+1 −1		doc/examples/README.link
+60 −0		doc/examples/get_to.cpp
+1 −0		doc/examples/get_to.link
+11 −0		doc/examples/get_to.output
+3 −3		doc/examples/meta.output
+1 −1		doc/index.md
+ −		doc/json.gif
+8 −4		include/nlohmann/adl_serializer.hpp
+39 −58		include/nlohmann/detail/conversions/from_json.hpp
+16 −32		include/nlohmann/detail/conversions/to_json.hpp
+80 −69		include/nlohmann/detail/input/input_adapters.hpp
+1 −22		include/nlohmann/detail/macro_scope.hpp
+0 −1		include/nlohmann/detail/macro_unscope.hpp
+0 −20		include/nlohmann/detail/meta/cpp_future.hpp
+153 −108		include/nlohmann/detail/meta/type_traits.hpp
+5 −2		include/nlohmann/detail/meta/void_t.hpp
+1 −1		include/nlohmann/detail/output/serializer.hpp
+132 −104		include/nlohmann/json.hpp
+7 −3		meson.build
+506 −491		single_include/nlohmann/json.hpp
+19 −14		test/CMakeLists.txt
+15 −0		test/cmake_add_subdirectory/CMakeLists.txt
+13 −0		test/cmake_add_subdirectory/project/CMakeLists.txt
+8 −0		test/cmake_add_subdirectory/project/main.cpp
+15 −0		test/cmake_import/CMakeLists.txt
+12 −0		test/cmake_import/project/CMakeLists.txt
+8 −0		test/cmake_import/project/main.cpp
+15 −0		test/cmake_import_minver/CMakeLists.txt
+8 −0		test/cmake_import_minver/project/CMakeLists.txt
+8 −0		test/cmake_import_minver/project/main.cpp
+1 −1		test/src/fuzzer-driver_afl.cpp
+1 −1		test/src/fuzzer-parse_cbor.cpp
+1 −1		test/src/fuzzer-parse_json.cpp
+1 −1		test/src/fuzzer-parse_msgpack.cpp
+1 −1		test/src/fuzzer-parse_ubjson.cpp
+1 −1		test/src/unit-algorithms.cpp
+1 −1		test/src/unit-allocator.cpp
+1 −1		test/src/unit-alt-string.cpp
+1 −1		test/src/unit-capacity.cpp
+1 −1		test/src/unit-cbor.cpp
+1 −1		test/src/unit-class_const_iterator.cpp
+1 −1		test/src/unit-class_iterator.cpp
+1 −1		test/src/unit-class_lexer.cpp
+1 −1		test/src/unit-class_parser.cpp
+1 −1		test/src/unit-comparison.cpp
+1 −1		test/src/unit-concepts.cpp
+1 −1		test/src/unit-constructor1.cpp
+1 −1		test/src/unit-constructor2.cpp
+1 −1		test/src/unit-convenience.cpp
+1 −1		test/src/unit-conversions.cpp
+1 −1		test/src/unit-deserialization.cpp
+14 −14		test/src/unit-element_access1.cpp
+27 −27		test/src/unit-element_access2.cpp
+1 −1		test/src/unit-inspection.cpp
+1 −1		test/src/unit-items.cpp
+1 −1		test/src/unit-iterators1.cpp
+1 −1		test/src/unit-iterators2.cpp
+4 −3		test/src/unit-json_patch.cpp
+1 −1		test/src/unit-json_pointer.cpp
+1 −1		test/src/unit-merge_patch.cpp
+3 −3		test/src/unit-meta.cpp
+1 −1		test/src/unit-modifiers.cpp
+1 −1		test/src/unit-msgpack.cpp
+1 −1		test/src/unit-noexcept.cpp
+1 −1		test/src/unit-pointer_access.cpp
+1 −1		test/src/unit-readme.cpp
+1 −1		test/src/unit-reference_access.cpp
+18 −12		test/src/unit-regression.cpp
+1 −1		test/src/unit-serialization.cpp
+11 −10		test/src/unit-testsuites.cpp
+1 −1		test/src/unit-to_chars.cpp
+1 −1		test/src/unit-ubjson.cpp
+20 −1		test/src/unit-udt.cpp
+1 −1		test/src/unit-unicode.cpp
+1 −1		test/src/unit-wstring.cpp
+1 −1		test/src/unit.cpp