diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-23 18:34:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-23 18:34:26 (GMT) |
| commit | 6f3341591dfbb85f69e224b66bb9f7d4fa7f05cc (patch) | |
| tree | 41cd32cc5656a238491ed5656a925e4daba8ce82 /Source/kwsys | |
| parent | ae5f98a5e36da8cf3c75625ffb9a1d34aa2407cb (diff) | |
| parent | 47a8ff3491cf4892eb2b28048b5f987a4ec1187a (diff) | |
| download | CMake-6f3341591dfbb85f69e224b66bb9f7d4fa7f05cc.zip CMake-6f3341591dfbb85f69e224b66bb9f7d4fa7f05cc.tar.gz CMake-6f3341591dfbb85f69e224b66bb9f7d4fa7f05cc.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-05-23 (411e958f)
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/ConsoleBuf.hxx.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/kwsys/ConsoleBuf.hxx.in b/Source/kwsys/ConsoleBuf.hxx.in index 32e680c..46d65a8 100644 --- a/Source/kwsys/ConsoleBuf.hxx.in +++ b/Source/kwsys/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); |