diff options
| author | Brad King <brad.king@kitware.com> | 2010-08-11 20:17:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-08-11 20:17:09 (GMT) |
| commit | 31a313d47043923bc722554175912e75a03a13f6 (patch) | |
| tree | 0ff5155324150c40c1fcb95d553cdc38df0b5ad6 /Source/CPack/cmCPackGenerator.cxx | |
| parent | cd7b8a03f5403603da44432470f177601b5bf42b (diff) | |
| download | CMake-31a313d47043923bc722554175912e75a03a13f6.zip CMake-31a313d47043923bc722554175912e75a03a13f6.tar.gz CMake-31a313d47043923bc722554175912e75a03a13f6.tar.bz2 | |
CPack: Avoid member shadowing after API refactor
After converting method arguments to members we need to avoid use of the
same names as local variables and other method arguments.
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index b59e980..37b8d5a 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -331,13 +331,13 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories( { cmCPackLogger(cmCPackLog::LOG_DEBUG, "Find files" << std::endl); cmsys::Glob gl; - std::string toplevel = it->c_str(); + std::string top = it->c_str(); it ++; std::string subdir = it->c_str(); - std::string findExpr = toplevel; + std::string findExpr = top; findExpr += "/*"; cmCPackLogger(cmCPackLog::LOG_OUTPUT, - "- Install directory: " << toplevel << std::endl); + "- Install directory: " << top << std::endl); gl.RecurseOn(); if ( !gl.FindFiles(findExpr) ) { @@ -369,7 +369,7 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories( } std::string filePath = tempDir; filePath += "/" + subdir + "/" - + cmSystemTools::RelativePath(toplevel.c_str(), gfit->c_str()); + + cmSystemTools::RelativePath(top.c_str(), gfit->c_str()); cmCPackLogger(cmCPackLog::LOG_DEBUG, "Copy file: " << inFile.c_str() << " -> " << filePath.c_str() << std::endl); if ( !cmSystemTools::CopyFileIfDifferent(inFile.c_str(), |