[Cmake-commits] CMake branch, next, updated. v2.8.12-3921-g5ddd06b

[Nils Gladitz]

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  5ddd06b29c00455756744e1ab06ec3f442496c48 (commit)
       via  b98954df1b298f43cdc241bd17213704108a8327 (commit)
      from  5d4128ff8fbc37e2870cff648a4cd9079df33c91 (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=5ddd06b29c00455756744e1ab06ec3f442496c48
commit 5ddd06b29c00455756744e1ab06ec3f442496c48
Merge: 5d4128f b98954d
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Oct 12 04:38:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 12 04:38:00 2013 -0400

    Merge topic 'wix-deterministic-ids' into next
    
    b98954d CPackWiX: replace std:size_t with size_t for older compilers


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b98954df1b298f43cdc241bd17213704108a8327
commit b98954df1b298f43cdc241bd17213704108a8327
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Oct 12 10:34:04 2013 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sat Oct 12 10:34:04 2013 +0200

    CPackWiX: replace std:size_t with size_t for older compilers

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 344d1ff..b9af052 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -703,7 +703,7 @@ std::string cmCPackWIXGenerator::CreateNewIdForPath(const std::string& path)
   std::string identifier;
   std::string currentComponent;
 
-  for(std::size_t i = 1; i < components.size(); ++i)
+  for(size_t i = 1; i < components.size(); ++i)
     {
     if(i != 1) identifier += '.';
 
@@ -775,7 +775,7 @@ std::string cmCPackWIXGenerator::NormalizeComponentForId(
   std::string result;
   result.resize(component.size());
 
-  for(std::size_t i = 0; i < component.size(); ++i)
+  for(size_t i = 0; i < component.size(); ++i)
     {
     char c = component[i];
     if(IsLegalIdCharacter(c))

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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake