Merge pull request #1797 from t-b/fix-integer-truncation

iteration_proxy: Fix integer truncation from std::size_t to int
nlohmann · Oct 17, 2019 · 0245ae5 · 0245ae5
2 parents 4c06191 + 35b47c2
commit 0245ae5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/include/nlohmann/detail/iterators/iteration_proxy.hpp b/include/nlohmann/detail/iterators/iteration_proxy.hpp
@@ -13,7 +13,7 @@ namespace nlohmann
 namespace detail
 {
 template<typename string_type>
-void int_to_string( string_type& target, int value )
+void int_to_string( string_type& target, std::size_t value )
 {
     target = std::to_string(value);
 }

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -3277,7 +3277,7 @@ namespace nlohmann
 namespace detail
 {
 template<typename string_type>
-void int_to_string( string_type& target, int value )
+void int_to_string( string_type& target, std::size_t value )
 {
     target = std::to_string(value);
 }

diff --git a/test/src/unit-alt-string.cpp b/test/src/unit-alt-string.cpp
@@ -154,7 +154,7 @@ class alt_string
     friend bool ::operator<(const char*, const alt_string&);
 };
 
-void int_to_string( alt_string& target, int value )
+void int_to_string( alt_string& target, std::size_t value )
 {
     target = std::to_string(value).c_str();
 }