This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via cbaa57bc2e31a477023489537ce1c1b450f1c99d (commit)
via 91d945a4e9618f1ff6077dbe9f6cd1bd2b9ff733 (commit)
via 24c4f18c7272b4eea9e2a85b20f1d18f28be69fa (commit)
from cafd80b1eaddb3279e7e324b8d9d9473304f5e1c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbaa57bc2e31a477023489537ce1c1b450f1c99d
commit cbaa57bc2e31a477023489537ce1c1b450f1c99d
Merge: cafd80b 91d945a
Author: David Cole <david.c...@kitware.com>
AuthorDate: Wed Jun 20 17:50:26 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jun 20 17:50:26 2012 -0400
Merge topic 'eliminate-warnings' into next
91d945a Remove unused ivars to eliminate compiler warnings
24c4f18 Remove unused ivars to eliminate compiler warnings
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91d945a4e9618f1ff6077dbe9f6cd1bd2b9ff733
commit 91d945a4e9618f1ff6077dbe9f6cd1bd2b9ff733
Author: David Cole <david.c...@kitware.com>
AuthorDate: Wed Jun 20 16:55:37 2012 -0400
Commit: David Cole <david.c...@kitware.com>
CommitDate: Wed Jun 20 17:44:10 2012 -0400
Remove unused ivars to eliminate compiler warnings
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)
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24c4f18c7272b4eea9e2a85b20f1d18f28be69fa
commit 24c4f18c7272b4eea9e2a85b20f1d18f28be69fa
Author: Sean McBride <s...@rogue-research.com>
AuthorDate: Wed Jun 20 12:17:15 2012 -0400
Commit: David Cole <david.c...@kitware.com>
CommitDate: Wed Jun 20 17:43:37 2012 -0400
Remove unused ivars to eliminate compiler warnings
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;
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestBZR.cxx | 3 +--
Source/cmMakefileTargetGenerator.cxx | 6 ++----
Source/cmOrderDirectories.h | 1 -
3 files changed, 3 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
