From 8051cf6ba7c30686e1bf301fe160c40b9c85c291 Mon Sep 17 00:00:00 2001 From: Mark Lakata Date: Mon, 2 Mar 2015 11:57:17 -0800 Subject: [PATCH] changed length argument of duplicateStringValue from unsigned int to size_t, to avoid warnings in Visual Studio. --- src/lib_json/json_value.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp index 427c33a..76fa155 100644 --- a/src/lib_json/json_value.cpp +++ b/src/lib_json/json_value.cpp @@ -52,7 +52,7 @@ const LargestInt Value::maxLargestInt = LargestInt(LargestUInt(-1) / 2); const LargestUInt Value::maxLargestUInt = LargestUInt(-1); /// Unknown size marker -static const unsigned int unknown = (unsigned)-1; +static const size_t unknown = (size_t)-1; #if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) template @@ -82,13 +82,13 @@ static inline bool InRange(double d, T min, U max) { * @return Pointer on the duplicate instance of string. */ static inline char* duplicateStringValue(const char* value, - unsigned int length = unknown) { + size_t length = unknown) { if (length == unknown) - length = (unsigned int)strlen(value); + length = strlen(value); // Avoid an integer overflow in the call to malloc below by limiting length // to a sane value. - if (length >= (unsigned)Value::maxInt) + if (length >= (size_t)Value::maxInt) length = Value::maxInt - 1; char* newString = static_cast(malloc(length + 1));