kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPack: Fix dashboard warnings (#11575) 

Fix int vs. size_t conversion warnings that only showed up in
the 64-bit builds.
This commit is contained in:
David Cole 2012-12-03 13:35:29 -05:00
parent 0729ad476c
commit ad0f73573f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/CPack/WiX/cmWIXSourceWriter.cxx
View File

@ -115,7 +115,7 @@ std::string cmWIXSourceWriter::WindowsCodepageToUtf8(const std::string& value)
} }
int characterCount = MultiByteToWideChar( int characterCount = MultiByteToWideChar(
CP_ACP, 0, value.c_str(), value.size(), 0, 0); CP_ACP, 0, value.c_str(), static_cast<int>(value.size()), 0, 0);
if(characterCount == 0) if(characterCount == 0)
{ {
@ -125,10 +125,11 @@ std::string cmWIXSourceWriter::WindowsCodepageToUtf8(const std::string& value)
std::vector<wchar_t> utf16(characterCount); std::vector<wchar_t> utf16(characterCount);
MultiByteToWideChar( MultiByteToWideChar(
CP_ACP, 0, value.c_str(), value.size(), &utf16[0], utf16.size()); CP_ACP, 0, value.c_str(), static_cast<int>(value.size()),
&utf16[0], static_cast<int>(utf16.size()));
int utf8ByteCount = int utf8ByteCount = WideCharToMultiByte(
WideCharToMultiByte(CP_UTF8, 0, &utf16[0], utf16.size(), 0, 0, 0, 0); CP_UTF8, 0, &utf16[0], static_cast<int>(utf16.size()), 0, 0, 0, 0);
if(utf8ByteCount == 0) if(utf8ByteCount == 0)
{ {
@ -137,8 +138,8 @@ std::string cmWIXSourceWriter::WindowsCodepageToUtf8(const std::string& value)
std::vector<char> utf8(utf8ByteCount); std::vector<char> utf8(utf8ByteCount);
WideCharToMultiByte(CP_UTF8, 0, &utf16[0], utf16.size(), WideCharToMultiByte(CP_UTF8, 0, &utf16[0], static_cast<int>(utf16.size()),
&utf8[0], utf8.size(), 0, 0); &utf8[0], static_cast<int>(utf8.size()), 0, 0);
return std::string(&utf8[0], utf8.size()); return std::string(&utf8[0], utf8.size());
} }