diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-28 14:44:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-28 14:44:39 (GMT) |
| commit | c0574fd06731045d6c0a3a0f092216f7d2836ef1 (patch) | |
| tree | 6cd88ecc2da0fa08b76afbab39b8209ce41bc6ad | |
| parent | 4480a9262da520730e48dc1b749245a84591fd8c (diff) | |
| parent | a7fe4413d5d2e156c8b9f126e713f0a1085ad1f7 (diff) | |
| download | CMake-c0574fd06731045d6c0a3a0f092216f7d2836ef1.zip CMake-c0574fd06731045d6c0a3a0f092216f7d2836ef1.tar.gz CMake-c0574fd06731045d6c0a3a0f092216f7d2836ef1.tar.bz2 | |
Merge topic 'jsoncpp-add-missing-cast'
a7fe4413 jsoncpp: Add missing cast to convert from char to UInt
| -rw-r--r-- | Utilities/cmjsoncpp/src/lib_json/json_reader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp b/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp index 41896a7..7b33828 100644 --- a/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp +++ b/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp @@ -529,7 +529,7 @@ bool Reader::decodeNumber(Token& token, Value& decoded) { return addError("'" + std::string(token.start_, token.end_) + "' is not a number.", token); - Value::UInt digit(c - '0'); + Value::UInt digit(static_cast<Value::UInt>(c - '0')); if (value >= threshold) { // We've hit or exceeded the max value divided by 10 (rounded down). If // a) we've only just touched the limit, b) this is the last digit, and |