open-source-parsers/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-23 01:38:11 +08:00
Code Issues Releases Wiki Activity

STYLE: Avoid unnecessary conversions from size_t to unsigned int

Browse Source 
Make the index values consistent with size_t.
This commit is contained in:
Hans Johnson
2019-01-14 19:02:40 -06:00
committed by Hans Johnson
parent d11732043a
commit 21a4185634
3 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib_json/json_reader.cpp
View File

@@ -888,7 +888,7 @@ public:
bool failIfExtra_;
bool rejectDupKeys_;
bool allowSpecialFloats_;
int stackLimit_;
size_t stackLimit_;
}; // OurFeatures
// exact copy of Implementation of class Features
@@ -1087,7 +1087,7 @@ bool OurReader::parse(const char* beginDoc,
bool OurReader::readValue() {
// To preserve the old behaviour we cast size_t to int.
if (static_cast<int>(nodes_.size()) > features_.stackLimit_)
if (nodes_.size() > features_.stackLimit_)
throwRuntimeError("Exceeded stackLimit in readValue().");
Token token;
skipCommentTokens(token);
@@ -1917,7 +1917,11 @@ CharReader* CharReaderBuilder::newCharReader() const {
settings_["allowDroppedNullPlaceholders"].asBool();
features.allowNumericKeys_ = settings_["allowNumericKeys"].asBool();
features.allowSingleQuotes_ = settings_["allowSingleQuotes"].asBool();
features.stackLimit_ = settings_["stackLimit"].asInt();
#if defined(JSON_HAS_INT64)
features.stackLimit_ = settings_["stackLimit"].asUInt64();
#else
features.stackLimit_ = settings_["stackLimit"].asUInt();
#endif
features.failIfExtra_ = settings_["failIfExtra"].asBool();
features.rejectDupKeys_ = settings_["rejectDupKeys"].asBool();
features.allowSpecialFloats_ = settings_["allowSpecialFloats"].asBool();