From 24c4f18c7272b4eea9e2a85b20f1d18f28be69fa Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 20 Jun 2012 12:17:15 -0400 Subject: [PATCH 1/2] Remove unused ivars to eliminate compiler warnings --- Source/cmOrderDirectories.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/cmOrderDirectories.h b/Source/cmOrderDirectories.h index 775a4ebb8..96a75de17 100644 --- a/Source/cmOrderDirectories.h +++ b/Source/cmOrderDirectories.h @@ -48,7 +48,6 @@ private: std::vector OrderedDirectories; - bool OrderedDirectoriesComputed; std::vector ConstraintEntries; std::vector ImplicitDirEntries; std::vector UserDirectories; From 91d945a4e9618f1ff6077dbe9f6cd1bd2b9ff733 Mon Sep 17 00:00:00 2001 From: David Cole Date: Wed, 20 Jun 2012 16:55:37 -0400 Subject: [PATCH 2/2] Remove unused ivars to eliminate compiler warnings --- Source/CTest/cmCTestBZR.cxx | 3 +-- Source/cmMakefileTargetGenerator.cxx | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx index 36302df19..381c70ce5 100644 --- a/Source/CTest/cmCTestBZR.cxx +++ b/Source/CTest/cmCTestBZR.cxx @@ -128,13 +128,12 @@ class cmCTestBZR::RevnoParser: public cmCTestVC::LineParser { public: RevnoParser(cmCTestBZR* bzr, const char* prefix, std::string& rev): - BZR(bzr), Rev(rev) + Rev(rev) { this->SetLog(&bzr->Log, prefix); this->RegexRevno.compile("^([0-9]+)$"); } private: - cmCTestBZR* BZR; std::string& Rev; cmsys::RegularExpression RegexRevno; virtual bool ProcessLine() diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index df892759f..16e3e026c 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1416,10 +1416,9 @@ class cmMakefileTargetGeneratorObjectStrings { public: cmMakefileTargetGeneratorObjectStrings(std::vector& strings, - cmMakefile* mf, cmLocalUnixMakefileGenerator3* lg, std::string::size_type limit): - Strings(strings), Makefile(mf), LocalGenerator(lg), LengthLimit(limit) + Strings(strings), LocalGenerator(lg), LengthLimit(limit) { this->Space = ""; } @@ -1454,7 +1453,6 @@ public: } private: std::vector& Strings; - cmMakefile* Makefile; cmLocalUnixMakefileGenerator3* LocalGenerator; std::string::size_type LengthLimit; std::string CurrentString; @@ -1469,7 +1467,7 @@ cmMakefileTargetGenerator std::string::size_type limit) { cmMakefileTargetGeneratorObjectStrings - helper(objStrings, this->Makefile, this->LocalGenerator, limit); + helper(objStrings, this->LocalGenerator, limit); for(std::vector::const_iterator i = this->Objects.begin(); i != this->Objects.end(); ++i) {