[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1189-g11f9de8

[David Cole]

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  11f9de8df99376e5ae103e19efd334735da22f58 (commit)
       via  ad0f73573fcc59c7c428ef5e529f8fec6a1cfbe6 (commit)
      from  62db66b7253ad8adce8c61c7c62cbf6a41323751 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11f9de8df99376e5ae103e19efd334735da22f58
commit 11f9de8df99376e5ae103e19efd334735da22f58
Merge: 62db66b ad0f735
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 3 13:37:33 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 3 13:37:33 2012 -0500

    Merge topic 'fix-11575-add-wix-support-to-cpack' into next
    
    ad0f735 CPack: Fix dashboard warnings (#11575)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad0f73573fcc59c7c428ef5e529f8fec6a1cfbe6
commit ad0f73573fcc59c7c428ef5e529f8fec6a1cfbe6
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 3 13:35:29 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Dec 3 13:35:29 2012 -0500

    CPack: Fix dashboard warnings (#11575)
    
    Fix int vs. size_t conversion warnings that only showed up in
    the 64-bit builds.

diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx
index cc00e57..b890ccd 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx
@@ -115,7 +115,7 @@ std::string cmWIXSourceWriter::WindowsCodepageToUtf8(const std::string& value)
     }
 
   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)
     {
@@ -125,10 +125,11 @@ std::string cmWIXSourceWriter::WindowsCodepageToUtf8(const std::string& value)
   std::vector<wchar_t> utf16(characterCount);
 
   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 =
-    WideCharToMultiByte(CP_UTF8, 0, &utf16[0], utf16.size(), 0, 0, 0, 0);
+  int utf8ByteCount = WideCharToMultiByte(
+    CP_UTF8, 0, &utf16[0], static_cast<int>(utf16.size()), 0, 0, 0, 0);
 
   if(utf8ByteCount == 0)
     {
@@ -137,8 +138,8 @@ std::string cmWIXSourceWriter::WindowsCodepageToUtf8(const std::string& value)
 
   std::vector<char> utf8(utf8ByteCount);
 
-  WideCharToMultiByte(CP_UTF8, 0, &utf16[0], utf16.size(),
-    &utf8[0], utf8.size(), 0, 0);
+  WideCharToMultiByte(CP_UTF8, 0, &utf16[0], static_cast<int>(utf16.size()),
+    &utf8[0], static_cast<int>(utf8.size()), 0, 0);
 
   return std::string(&utf8[0], utf8.size());
 }

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

Summary of changes:
 Source/CPack/WiX/cmWIXSourceWriter.cxx |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake