Merge pull request #2193 from dota17/issue#2059

nlohmann · web-flow · commit 635b9a0ae4f3 · 2020-06-24T11:46:48.000+02:00
Fix consistency in function `int_to_string()`
diff --git a/include/nlohmann/detail/iterators/iteration_proxy.hpp b/include/nlohmann/detail/iterators/iteration_proxy.hpp
@@ -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
 {
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -3657,7 +3657,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
 {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@ namespace detail`
`15`	`15`	`template<typename string_type>`
`16`	`16`	`void int_to_string( string_type& target, std::size_t value )`
`17`	`17`	`{`
`18`		`- target = std::to_string(value);`
	`18`	`+ // For ADL`
	`19`	`+ using std::to_string;`
	`20`	`+ target = to_string(value);`
`19`	`21`	`}`
`20`	`22`	`template <typename IteratorType> class iteration_proxy_value`
`21`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3657,7 +3657,9 @@ namespace detail`
`3657`	`3657`	`template<typename string_type>`
`3658`	`3658`	`void int_to_string( string_type& target, std::size_t value )`
`3659`	`3659`	`{`
`3660`		`- target = std::to_string(value);`
	`3660`	`+ // For ADL`
	`3661`	`+ using std::to_string;`
	`3662`	`+ target = to_string(value);`
`3661`	`3663`	`}`
`3662`	`3664`	`template <typename IteratorType> class iteration_proxy_value`
`3663`	`3665`	`{`