Commit 47a8ff34 authored by Kitware Robot's avatar Kitware Robot Committed by Brad King
Browse files

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
parent 7be70ca6
...@@ -338,7 +338,7 @@ private: ...@@ -338,7 +338,7 @@ private:
} }
bool decodeInputBuffer(const std::string buffer, std::wstring& wbuffer) bool decodeInputBuffer(const std::string buffer, std::wstring& wbuffer)
{ {
int length = int(buffer.length()); size_t length = buffer.length();
if (length == 0) { if (length == 0) {
wbuffer = std::wstring(); wbuffer = std::wstring();
return true; return true;
...@@ -353,11 +353,12 @@ private: ...@@ -353,11 +353,12 @@ private:
data += BOMsize; data += BOMsize;
length -= BOMsize; length -= BOMsize;
} }
const int wlength = const size_t wlength = static_cast<size_t>(MultiByteToWideChar(
MultiByteToWideChar(actualCodepage, 0, data, length, NULL, 0); actualCodepage, 0, data, static_cast<int>(length), NULL, 0));
wchar_t* wbuf = new wchar_t[wlength]; wchar_t* wbuf = new wchar_t[wlength];
const bool success = 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 ? true
: false; : false;
wbuffer = std::wstring(wbuf, wlength); wbuffer = std::wstring(wbuf, wlength);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment