[Cmake-commits] CMake branch, master, updated. v3.8.1-1277-g5e0858c

[Kitware Robot]

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, master has been updated
       via  5e0858cc15d91cb1364f7fcba2cd92519adf0a19 (commit)
       via  6f3341591dfbb85f69e224b66bb9f7d4fa7f05cc (commit)
       via  47a8ff3491cf4892eb2b28048b5f987a4ec1187a (commit)
      from  56f87f179a026f1955994804b998485ee7910bec (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=5e0858cc15d91cb1364f7fcba2cd92519adf0a19
commit 5e0858cc15d91cb1364f7fcba2cd92519adf0a19
Merge: 56f87f1 6f33415
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 24 14:25:55 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 24 10:26:09 2017 -0400

    Merge topic 'update-kwsys'
    
    6f334159 Merge branch 'upstream-KWSys' into update-kwsys
    47a8ff34 KWSys 2017-05-23 (411e958f)
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !882


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f3341591dfbb85f69e224b66bb9f7d4fa7f05cc
commit 6f3341591dfbb85f69e224b66bb9f7d4fa7f05cc
Merge: ae5f98a 47a8ff3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 23 14:34:26 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 23 14:34:26 2017 -0400

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2017-05-23 (411e958f)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47a8ff3491cf4892eb2b28048b5f987a4ec1187a
commit 47a8ff3491cf4892eb2b28048b5f987a4ec1187a
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Tue May 23 09:50:42 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 23 14:34:23 2017 -0400

    KWSys 2017-05-23 (411e958f)
    
    Code extracted from:
    
        https://gitlab.kitware.com/utils/kwsys.git
    
    at commit 411e958f46246eaf8e044b6d0af542685bca5fcf (master).
    
    Upstream Shortlog
    -----------------
    
    Brad King (1):
          c23e388b ConsoleBuf: Avoid signed/unsigned comparison

diff --git a/ConsoleBuf.hxx.in b/ConsoleBuf.hxx.in
index 32e680c..46d65a8 100644
--- a/ConsoleBuf.hxx.in
+++ b/ConsoleBuf.hxx.in
@@ -338,7 +338,7 @@ private:
   }
   bool decodeInputBuffer(const std::string buffer, std::wstring& wbuffer)
   {
-    int length = int(buffer.length());
+    size_t length = buffer.length();
     if (length == 0) {
       wbuffer = std::wstring();
       return true;
@@ -353,11 +353,12 @@ private:
       data += BOMsize;
       length -= BOMsize;
     }
-    const int wlength =
-      MultiByteToWideChar(actualCodepage, 0, data, length, NULL, 0);
+    const size_t wlength = static_cast<size_t>(MultiByteToWideChar(
+      actualCodepage, 0, data, static_cast<int>(length), NULL, 0));
     wchar_t* wbuf = new wchar_t[wlength];
     const bool success =
-      MultiByteToWideChar(actualCodepage, 0, data, length, wbuf, wlength) > 0
+      MultiByteToWideChar(actualCodepage, 0, data, static_cast<int>(length),
+                          wbuf, static_cast<int>(wlength)) > 0
       ? true
       : false;
     wbuffer = std::wstring(wbuf, wlength);

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

Summary of changes:
 Source/kwsys/ConsoleBuf.hxx.in |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake