diff options
| -rw-r--r-- | Source/cmDependsJava.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 8 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 12 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 8 |
4 files changed, 11 insertions, 19 deletions
diff --git a/Source/cmDependsJava.cxx b/Source/cmDependsJava.cxx index 7e80e31..e03bc93 100644 --- a/Source/cmDependsJava.cxx +++ b/Source/cmDependsJava.cxx @@ -31,7 +31,7 @@ cmDependsJava::~cmDependsJava() //---------------------------------------------------------------------------- bool cmDependsJava::WriteDependencies(const char *src, - const char *file, std::ostream&) + const char *, std::ostream&) { // Make sure this is a scanning instance. if(!src || src[0] == '\0') diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index e550c2c..d1542c4 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -982,10 +982,10 @@ bool cmGlobalUnixMakefileGenerator3 cmLocalUnixMakefileGenerator3::IntegrityCheckSet>::const_iterator l = checkSet.begin(); l != checkSet.end(); ++l) { - std::string name = "CMAKE_NEEDS_REQUIRES_STEP_"; - name += l->first; - name += "_FLAG"; - if(lg->GetMakefile()->GetDefinition(name.c_str())) + std::string name2 = "CMAKE_NEEDS_REQUIRES_STEP_"; + name2 += l->first; + name2 += "_FLAG"; + if(lg->GetMakefile()->GetDefinition(name2.c_str())) { return true; } diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index d5d939c..ee3312d 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -427,8 +427,7 @@ cmLocalUnixMakefileGenerator3 std::string &obj, const char * lang, cmSourceFile& source, - std::vector<std::string>& depends, - std::string& depMakeFile) + std::vector<std::string>& depends) { // Create the list of dependencies known at cmake time. These are // shared between the object file and dependency scanning rule. @@ -454,7 +453,6 @@ cmLocalUnixMakefileGenerator3 cmTarget& target, cmSourceFile& source, std::vector<std::string>& depends, - std::string &depMakeFile, std::ostream &ruleFileStream) { // Open the rule file for writing. This should be copy-if-different @@ -464,8 +462,7 @@ cmLocalUnixMakefileGenerator3 std::string ruleFileNameFull = this->ConvertToFullPath(ruleFileName); // generate the depend scanning rule - this->WriteObjectDependRules(ruleFileStream, obj, lang, source, - depends, depMakeFile); + this->WriteObjectDependRules(ruleFileStream, obj, lang, source, depends); this->AppendRuleDepend(depends, ruleFileNameFull.c_str()); @@ -636,7 +633,7 @@ cmLocalUnixMakefileGenerator3 std::string depMakeFile; // generate the build rule file - this->WriteObjectBuildFile(obj, lang, target, source, depends, depMakeFile, + this->WriteObjectBuildFile(obj, lang, target, source, depends, ruleFileStream); // The object file should be checked for dependency integrity. @@ -753,8 +750,7 @@ cmLocalUnixMakefileGenerator3 //---------------------------------------------------------------------------- bool cmLocalUnixMakefileGenerator3 -::GenerateDependsMakeFile(const std::string& lang, const char* objFile, - std::string& depMakeFile, std::string& depMarkFile) +::GenerateDependsMakeFile(const std::string& lang, const char* objFile) { // Construct a checker for the given language. std::auto_ptr<cmDepends> diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 97f7f10..a9f94aa 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -209,7 +209,6 @@ protected: cmTarget& target, cmSourceFile& source, std::vector<std::string>& depends, - std::string &depMakeFile, std::ostream &filestr); // write the depend.make file for an object @@ -217,14 +216,11 @@ protected: std::string& obj, const char *lang, cmSourceFile& source, - std::vector<std::string>& depends, - std::string& depMarkFile); + std::vector<std::string>& depends); // this is used only by WriteObjectDependFile bool GenerateDependsMakeFile(const std::string& lang, - const char* objFile, - std::string& depMakeFile, - std::string& depMarkFile); + const char* objFile); // return the appropriate depends checker cmDepends* GetDependsChecker(const std::string& lang, |