diff options
| author | David Cole <david.cole@kitware.com> | 2012-06-21 15:55:44 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-06-21 15:55:44 (GMT) |
| commit | b0e5079ab55287e021e6ac37af0c3a83bc25d90e (patch) | |
| tree | fb5959e9df365a6e90959820522223c2a77c65f8 | |
| parent | 4042b50caa9ea67becd32eeb62f38cfc3c68bcb0 (diff) | |
| parent | 91d945a4e9618f1ff6077dbe9f6cd1bd2b9ff733 (diff) | |
| download | CMake-b0e5079ab55287e021e6ac37af0c3a83bc25d90e.zip CMake-b0e5079ab55287e021e6ac37af0c3a83bc25d90e.tar.gz CMake-b0e5079ab55287e021e6ac37af0c3a83bc25d90e.tar.bz2 | |
Merge topic 'eliminate-warnings'
91d945a Remove unused ivars to eliminate compiler warnings
24c4f18 Remove unused ivars to eliminate compiler warnings
| -rw-r--r-- | Source/CTest/cmCTestBZR.cxx | 3 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmOrderDirectories.h | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx index 36302df..381c70c 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 df89275..16e3e02 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1416,10 +1416,9 @@ class cmMakefileTargetGeneratorObjectStrings { public: cmMakefileTargetGeneratorObjectStrings(std::vector<std::string>& 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<std::string>& 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<std::string>::const_iterator i = this->Objects.begin(); i != this->Objects.end(); ++i) { diff --git a/Source/cmOrderDirectories.h b/Source/cmOrderDirectories.h index 775a4eb..96a75de 100644 --- a/Source/cmOrderDirectories.h +++ b/Source/cmOrderDirectories.h @@ -48,7 +48,6 @@ private: std::vector<std::string> OrderedDirectories; - bool OrderedDirectoriesComputed; std::vector<cmOrderDirectoriesConstraint*> ConstraintEntries; std::vector<cmOrderDirectoriesConstraint*> ImplicitDirEntries; std::vector<std::string> UserDirectories; |