general/json
2
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-02-11 00:12:30 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/input_adapters.hpp
	include/nlohmann/detail/input/lexer.hpp
	include/nlohmann/detail/output/binary_writer.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
This commit is contained in:
Niels Lohmann
2020-06-27 13:14:48 +02:00
parent 24e8562664 5ba0f65c34
commit ac3922c7aa
128 changed files with 7773 additions and 2268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/src/unit-class_const_iterator.cpp
View File

@@ -1,7 +1,7 @@
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 3.7.3
| | |__ | | | | | | version 3.8.0
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.