j3d1/json
1
0
Fork 0
Code Issues Pull requests 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
commit ac3922c7aa
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
128 changed files with 7773 additions and 2268 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/nlohmann/detail/iterators/iteration_proxy.hpp
View file

@ -15,7 +15,9 @@ namespace detail
template<typename string_type>
void int_to_string( string_type& target, std::size_t value )
{
target = std::to_string(value);
// For ADL
using std::to_string;
target = to_string(value);
}
template<typename IteratorType> class iteration_proxy_value
{