[Cmake-commits] CMake branch, next, updated. v3.3.2-3254-g9163059

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9163059ccf5f3f4cd652012a6ce25be800d7b470 (commit)
       via  a7fe4413d5d2e156c8b9f126e713f0a1085ad1f7 (commit)
       via  7c0b22a84e59c17e588da451ced454c6bc4232c2 (commit)
      from  0fe79c067090dd880826e5334a30af955e15c5e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9163059ccf5f3f4cd652012a6ce25be800d7b470
commit 9163059ccf5f3f4cd652012a6ce25be800d7b470
Merge: 0fe79c0 a7fe441
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 25 08:41:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 25 08:41:11 2015 -0400

    Merge topic 'jsoncpp-add-missing-cast' into next
    
    a7fe4413 jsoncpp: Add missing cast to convert from char to UInt
    7c0b22a8 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7fe4413d5d2e156c8b9f126e713f0a1085ad1f7
commit a7fe4413d5d2e156c8b9f126e713f0a1085ad1f7
Author:     Marc Chevrier <marc.chevrier at sap.com>
AuthorDate: Fri Sep 25 09:16:56 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 25 08:38:20 2015 -0400

    jsoncpp: Add missing cast to convert from char to UInt
    
    When parsing digits we know our `c - '0'` expression results in a
    non-negative value due to preceding conditions.  Simply cast the result
    to UInt.  This fixes compilation on SolarisStudio 12.4.

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

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake                        |    2 +-
 Utilities/cmjsoncpp/src/lib_json/json_reader.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake