Merge branch 'develop' of https://github.com/nlohmann/json into bon8

Browse Source

 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

...

This commit is contained in:

Niels Lohmann

2022-05-01 18:46:44 +02:00

parent 9105f5514e 0c698b75cc

commit 88fbbd3aa8

925 changed files with 15696 additions and 7756 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

include/nlohmann/json.hpp

+533 -185

File diff suppressed because it is too large Load Diff