From 07e28fa8f081ecd029f64e6e77664213eb2f88b4 Mon Sep 17 00:00:00 2001
From: Jordan Bayles <jophba@chromium.org>
Date: Fri, 6 Dec 2019 11:04:14 -0800
Subject: [PATCH] \#1113 Fix CMake build signed/unsigned issue

This patch fixes a build issue with CMake caused by signedness
comparison issues.
---
 src/test_lib_json/main.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
index a20ef3e..629f78f 100644
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -121,13 +121,18 @@ struct ValueTest : JsonTest::TestCase {
 };
 
 Json::String ValueTest::normalizeFloatingPointStr(const Json::String& s) {
-  auto index = s.find_last_of("eE");
-  if (index == s.npos)
+  Json::String::size_type exponentIndex = s.find_last_of("eE");
+  if (exponentIndex == s.npos) {
     return s;
-  int hasSign = (s[index + 1] == '+' || s[index + 1] == '-') ? 1 : 0;
-  auto exponentStartIndex = index + 1 + hasSign;
-  Json::String normalized = s.substr(0, exponentStartIndex);
-  auto indexDigit = s.find_first_not_of('0', exponentStartIndex);
+  }
+  ++exponentIndex;
+  const bool hasSign = s[exponentIndex] == '+' || s[exponentIndex] == '-';
+  if (hasSign) {
+    ++exponentIndex;
+  }
+
+  const Json::String normalized = s.substr(0u, exponentIndex);
+  const Json::String::size_type indexDigit = s.find_first_not_of('0', exponentIndex);
   Json::String exponent = "0";
   if (indexDigit != s.npos) { // nonzero exponent
     exponent = s.substr(indexDigit);