kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'eliminate-warnings' 

91d945a Remove unused ivars to eliminate compiler warnings
24c4f18 Remove unused ivars to eliminate compiler warnings
This commit is contained in:
David Cole 2012-06-21 11:55:44 -04:00 committed by CMake Topic Stage
parent 4042b50caa 91d945a4e9
commit b0e5079ab5
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CTest/cmCTestBZR.cxx
View File

@ -128,13 +128,12 @@ class cmCTestBZR::RevnoParser: public cmCTestVC::LineParser
{ {
public: public:
RevnoParser(cmCTestBZR* bzr, const char* prefix, std::string& rev): RevnoParser(cmCTestBZR* bzr, const char* prefix, std::string& rev):
BZR(bzr), Rev(rev) Rev(rev)
{ {
this->SetLog(&bzr->Log, prefix); this->SetLog(&bzr->Log, prefix);
this->RegexRevno.compile("^([0-9]+)$"); this->RegexRevno.compile("^([0-9]+)$");
} }
private: private:
cmCTestBZR* BZR;
std::string& Rev; std::string& Rev;
cmsys::RegularExpression RegexRevno; cmsys::RegularExpression RegexRevno;
virtual bool ProcessLine() virtual bool ProcessLine()

6
Source/cmMakefileTargetGenerator.cxx
View File

@ -1416,10 +1416,9 @@ class cmMakefileTargetGeneratorObjectStrings
{ {
public: public:
cmMakefileTargetGeneratorObjectStrings(std::vector<std::string>& strings, cmMakefileTargetGeneratorObjectStrings(std::vector<std::string>& strings,
cmMakefile* mf,
cmLocalUnixMakefileGenerator3* lg, cmLocalUnixMakefileGenerator3* lg,
std::string::size_type limit): std::string::size_type limit):
Strings(strings), Makefile(mf), LocalGenerator(lg), LengthLimit(limit) Strings(strings), LocalGenerator(lg), LengthLimit(limit)
{ {
this->Space = ""; this->Space = "";
} }
@ -1454,7 +1453,6 @@ public:
} }
private: private:
std::vector<std::string>& Strings; std::vector<std::string>& Strings;
cmMakefile* Makefile;
cmLocalUnixMakefileGenerator3* LocalGenerator; cmLocalUnixMakefileGenerator3* LocalGenerator;
std::string::size_type LengthLimit; std::string::size_type LengthLimit;
std::string CurrentString; std::string CurrentString;
@ -1469,7 +1467,7 @@ cmMakefileTargetGenerator
std::string::size_type limit) std::string::size_type limit)
{ {
cmMakefileTargetGeneratorObjectStrings cmMakefileTargetGeneratorObjectStrings
helper(objStrings, this->Makefile, this->LocalGenerator, limit); helper(objStrings, this->LocalGenerator, limit);
for(std::vector<std::string>::const_iterator i = this->Objects.begin(); for(std::vector<std::string>::const_iterator i = this->Objects.begin();
i != this->Objects.end(); ++i) i != this->Objects.end(); ++i)
{ {

1
Source/cmOrderDirectories.h
View File

@ -48,7 +48,6 @@ private:
std::vector<std::string> OrderedDirectories; std::vector<std::string> OrderedDirectories;
bool OrderedDirectoriesComputed;
std::vector<cmOrderDirectoriesConstraint*> ConstraintEntries; std::vector<cmOrderDirectoriesConstraint*> ConstraintEntries;
std::vector<cmOrderDirectoriesConstraint*> ImplicitDirEntries; std::vector<cmOrderDirectoriesConstraint*> ImplicitDirEntries;
std::vector<std::string> UserDirectories; std::vector<std::string> UserDirectories;