From 559a7294a6e7bcac0e69f2d40e33086378ad1d21 Mon Sep 17 00:00:00 2001 From: Billy Donahue Date: Fri, 6 Dec 2019 13:52:56 -0500 Subject: [PATCH 1/2] tweak to avoid implicit narrowing warning. change an int to size_t #1113 --- src/test_lib_json/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp index a20ef3ead..893316ec5 100644 --- a/src/test_lib_json/main.cpp +++ b/src/test_lib_json/main.cpp @@ -124,8 +124,8 @@ Json::String ValueTest::normalizeFloatingPointStr(const Json::String& s) { auto index = s.find_last_of("eE"); if (index == s.npos) return s; - int hasSign = (s[index + 1] == '+' || s[index + 1] == '-') ? 1 : 0; - auto exponentStartIndex = index + 1 + hasSign; + std::size_t signWidth = (s[index + 1] == '+' || s[index + 1] == '-' ) ? 1 : 0; + auto exponentStartIndex = index + 1 + signWidth; Json::String normalized = s.substr(0, exponentStartIndex); auto indexDigit = s.find_first_not_of('0', exponentStartIndex); Json::String exponent = "0"; From c82c4cd1922f424f8f64d259a2b2f5dbdb2a76dd Mon Sep 17 00:00:00 2001 From: Billy Donahue Date: Fri, 6 Dec 2019 13:53:55 -0500 Subject: [PATCH 2/2] Update main.cpp --- src/test_lib_json/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp index 893316ec5..6f4bbde04 100644 --- a/src/test_lib_json/main.cpp +++ b/src/test_lib_json/main.cpp @@ -124,7 +124,7 @@ Json::String ValueTest::normalizeFloatingPointStr(const Json::String& s) { auto index = s.find_last_of("eE"); if (index == s.npos) return s; - std::size_t signWidth = (s[index + 1] == '+' || s[index + 1] == '-' ) ? 1 : 0; + std::size_t signWidth = (s[index + 1] == '+' || s[index + 1] == '-') ? 1 : 0; auto exponentStartIndex = index + 1 + signWidth; Json::String normalized = s.substr(0, exponentStartIndex); auto indexDigit = s.find_first_not_of('0', exponentStartIndex);