outman/jsoncpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

\#1113 Fix CMake build signed/unsigned issue

Browse Source 
This patch fixes a build issue with CMake caused by signedness
comparison issues.
This commit is contained in:
Jordan Bayles 2019-12-06 11:04:14 -08:00
parent a3c8642886
commit 07e28fa8f0
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/test_lib_json/main.cpp
View File

@ -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);