[Cmake-commits] CMake branch, next, updated. v2.8.2-416-g7c87bfe

[Eric Noulard]

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  7c87bfedca075e7be87ff7c737102088b99969ec (commit)
       via  bd510fe4ea43ed6adfb28dc830db4489b59ef2aa (commit)
      from  761e6ffe15c090b4bfb19c9d36e37d2481a2a0b6 (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=7c87bfedca075e7be87ff7c737102088b99969ec
commit 7c87bfedca075e7be87ff7c737102088b99969ec
Merge: 761e6ff bd510fe
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Thu Aug 12 20:19:25 2010 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Thu Aug 12 20:19:25 2010 +0200

    Merge branch 'CPack-APIredesign' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd510fe4ea43ed6adfb28dc830db4489b59ef2aa
commit bd510fe4ea43ed6adfb28dc830db4489b59ef2aa
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Thu Aug 12 20:18:46 2010 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Thu Aug 12 20:18:46 2010 +0200

    CPack: Avoid member shadowing after API refactor (part2)
    
    After converting method arguments to members we need to avoid use of the
    same names as local variables and other method arguments. One more fix.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 37b8d5a..4ae2d1f 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -345,7 +345,7 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
           "Cannot find any files in the installed directory" << std::endl);
         return 0;
         }
-      std::vector<std::string>& files = gl.GetFiles();
+      files = gl.GetFiles();
       std::vector<std::string>::iterator gfit;
       std::vector<cmsys::RegularExpression>::iterator regIt;
       for ( gfit = files.begin(); gfit != files.end(); ++ gfit )

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

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


hooks/post-receive
-- 
CMake