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 3f5d8ca1a663d1ad4142944a668080ff452a5788 (commit) via 0a6e41448023fe4d11c409834cf235bdb28179bd (commit) from 55de65e7179782b252ea803b3087d6df59da9d28 (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=3f5d8ca1a663d1ad4142944a668080ff452a5788 commit 3f5d8ca1a663d1ad4142944a668080ff452a5788 Merge: 55de65e 0a6e414 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Jul 19 14:53:30 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jul 19 14:53:30 2013 -0400 Merge topic 'cpack-wix' into next 0a6e414 CPackWIX: Fix signed/unsigned comparison in cmCPackWIXGenerator http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a6e41448023fe4d11c409834cf235bdb28179bd commit 0a6e41448023fe4d11c409834cf235bdb28179bd Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Jul 19 14:50:47 2013 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Jul 19 14:48:44 2013 -0400 CPackWIX: Fix signed/unsigned comparison in cmCPackWIXGenerator While at it, use curly braces to denote the 'if' block. diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index e921819..cc9dec7 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -404,9 +404,9 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles() fileDefinitions.BeginElement("Shortcut"); std::string shortcutName = fileName; // the iconName is mor likely to contain blanks early on - const std::string::difference_type dotPos = shortcutName.find('.'); + std::string::size_type const dotPos = shortcutName.find('.'); if(std::string::npos == dotPos) - shortcutName = shortcutName.substr(0, dotPos); + { shortcutName = shortcutName.substr(0, dotPos); } fileDefinitions.AddAttribute("Id", "SHORTCUT_" + shortcutName); fileDefinitions.AddAttribute("Name", iconName); std::string target = "[" + directoryId + "]" + fileName; ----------------------------------------------------------------------- Summary of changes: Source/CPack/WiX/cmCPackWIXGenerator.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits