luo980/json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88fbbd3aa8
json/include/nlohmann
History
Niels Lohmann 88fbbd3aa8
Merge branch 'develop' of https://github.com/nlohmann/json into bon8 
 Conflicts:
	docs/examples/to_bon8.cpp
	docs/examples/to_bon8.output
	docs/mkdocs/docs/api/basic_json/to_bon8.md
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/input_adapters.hpp
	include/nlohmann/detail/output/binary_writer.hpp
	single_include/nlohmann/json.hpp
	test/CMakeLists.txt
	tests/src/unit-binary_formats.cpp
	tests/src/unit-bon8.cpp
2022-05-01 18:46:44 +02:00
..
detail Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2022-05-01 18:46:44 +02:00
thirdparty/hedley 🚨 add new CI and fix warnings (#2561) 2021-03-24 07:15:18 +01:00
adl_serializer.hpp Consolidate documentation (#3071) 2021-12-29 13:41:01 +01:00
byte_container_with_subtype.hpp Consolidate documentation (#3071) 2021-12-29 13:41:01 +01:00
json_fwd.hpp Consolidate documentation (#3071) 2021-12-29 13:41:01 +01:00
json.hpp Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2022-05-01 18:46:44 +02:00
ordered_map.hpp Implement support for string_view (attempt no. 3) (#3423) 2022-04-29 21:40:02 +02:00