From ccc292e4b0f0d0a5b8cd991b694163cc5b5435a0 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Wed, 27 Jul 2005 11:33:39 -0400 Subject: [PATCH] ENH: fix some warnings and cleanup some --- Source/cmLocalUnixMakefileGenerator3.cxx | 7 ++----- Source/cmLocalUnixMakefileGenerator3.h | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index ee3312d7a..4f09b1b85 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -423,10 +423,7 @@ cmLocalUnixMakefileGenerator3 //---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 -::WriteObjectDependRules(std::ostream& ruleFileStream, - std::string &obj, - const char * lang, - cmSourceFile& source, +::WriteObjectDependRules(cmSourceFile& source, std::vector& depends) { // Create the list of dependencies known at cmake time. These are @@ -462,7 +459,7 @@ cmLocalUnixMakefileGenerator3 std::string ruleFileNameFull = this->ConvertToFullPath(ruleFileName); // generate the depend scanning rule - this->WriteObjectDependRules(ruleFileStream, obj, lang, source, depends); + this->WriteObjectDependRules(source, depends); this->AppendRuleDepend(depends, ruleFileNameFull.c_str()); diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index a9f94aafc..1a4fae2d9 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -212,10 +212,7 @@ protected: std::ostream &filestr); // write the depend.make file for an object - void WriteObjectDependRules(std::ostream& ruleFileStream, - std::string& obj, - const char *lang, - cmSourceFile& source, + void WriteObjectDependRules(cmSourceFile& source, std::vector& depends); // this is used only by WriteObjectDependFile