diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-13 14:57:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-13 14:57:59 (GMT) |
| commit | dc90cd68778b374122162cd3a87a7b6d27ed6866 (patch) | |
| tree | 4c1744b09297b91be582cec3fab22e1a7a39613c /Utilities | |
| parent | a9d9e8cafccab60c209a23a7ff71fad572dd7399 (diff) | |
| parent | b9c6f08276951e815a1fcaef78f4e894471d4195 (diff) | |
| download | CMake-dc90cd68778b374122162cd3a87a7b6d27ed6866.zip CMake-dc90cd68778b374122162cd3a87a7b6d27ed6866.tar.gz CMake-dc90cd68778b374122162cd3a87a7b6d27ed6866.tar.bz2 | |
Merge topic 'fileapi'
b9c6f08276 Help: Add release note for fileapi feature
4b6b2a571c fileapi: extend codemodel v2 with directory details
eb8c7676a4 fileapi: extend codemodel v2 with a project model
42f0125ceb fileapi: Add test for cmakeFiles v1
6615408193 fileapi: add cmakeFiles v1
3f6ee75a66 fileapi: Add test for cache v2
7489e95b8e fileapi: add cache v2
ea0a060168 fileapi: Add test for codemodel v2
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2706
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/IWYU/mapping.imp | 2 | ||||
| -rw-r--r-- | Utilities/cmjsoncpp/src/lib_json/json_reader.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp index a68d767..c5231bb 100644 --- a/Utilities/IWYU/mapping.imp +++ b/Utilities/IWYU/mapping.imp @@ -123,6 +123,8 @@ { symbol: [ "SIGINT", private, "\"cm_uv.h\"", public ] }, { symbol: [ "ssize_t", private, "\"cm_uv.h\"", public ] }, + { symbol: [ "Json::ArrayIndex", private, "\"cm_jsoncpp_value.h\"", public ] }, + { symbol: [ "std::ifstream", private, "\"cmsys/FStream.hxx\"", public ] }, { symbol: [ "std::ofstream", private, "\"cmsys/FStream.hxx\"", public ] }, { symbol: [ "cmsys::ifstream", private, "\"cmsys/FStream.hxx\"", public ] }, diff --git a/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp b/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp index 0249cc9..6eeba0e 100644 --- a/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp +++ b/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp @@ -1581,7 +1581,7 @@ bool OurReader::decodeNumber(Token& token, Value& decoded) { ++current; // TODO: Help the compiler do the div and mod at compile time or get rid of them. Value::LargestUInt maxIntegerValue = - isNegative ? Value::LargestUInt(-Value::minLargestInt) + isNegative ? Value::LargestUInt(Value::minLargestInt) : Value::maxLargestUInt; Value::LargestUInt threshold = maxIntegerValue / 10; Value::LargestUInt value = 0; |