From 52b533ce2b4ed276affdbdf1a0ad11d68b4ea5fa Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 29 Jan 2005 07:57:21 -0500 Subject: [PATCH] COMP: Removed shadowed variable warning. --- Source/cmLocalUnixMakefileGenerator2.cxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator2.cxx b/Source/cmLocalUnixMakefileGenerator2.cxx index c2ff9ee97..321760f87 100644 --- a/Source/cmLocalUnixMakefileGenerator2.cxx +++ b/Source/cmLocalUnixMakefileGenerator2.cxx @@ -382,6 +382,7 @@ cmLocalUnixMakefileGenerator2 } // Get the full path name of the object file. + // TODO: Remove duplicate objects and warn. std::string obj = this->GetObjectFileName(target, source); // Create the directory containing the object file. This may be a @@ -560,19 +561,19 @@ cmLocalUnixMakefileGenerator2 { // Add the provides target to build the object file. std::vector no_commands; - std::vector depends; - depends.push_back(obj); + std::vector p_depends; + p_depends.push_back(obj); this->WriteMakeRule(ruleFileStream, 0, 0, - objectProvides.c_str(), depends, no_commands); + objectProvides.c_str(), p_depends, no_commands); } { // Add the requires target to recursively build the provides // target after needed information is up to date. std::vector no_depends; - std::vector commands; - commands.push_back(this->GetRecursiveMakeCall(objectProvides.c_str())); + std::vector r_commands; + r_commands.push_back(this->GetRecursiveMakeCall(objectProvides.c_str())); this->WriteMakeRule(ruleFileStream, 0, 0, - objectRequires.c_str(), no_depends, commands); + objectRequires.c_str(), no_depends, r_commands); } // Add this to the set of provides-requires objects on the target.