[Cmake-commits] CMake branch, next, updated. v2.8.7-3056-g1ff8087

[Brad King]

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  1ff8087e897324513bf370b3ce96d67432245dab (commit)
       via  aef248a4ff675aeb4af6aa44322bed76f4bcf990 (commit)
       via  e26657103fa95b2a898e438ec6eb982a3c0bf3cc (commit)
      from  234216ad5221518f03b830d351eb6e3733964487 (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=1ff8087e897324513bf370b3ce96d67432245dab
commit 1ff8087e897324513bf370b3ce96d67432245dab
Merge: 234216a aef248a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 5 08:37:54 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 5 08:37:54 2012 -0500

    Merge topic 'remove-unused-members' into next
    
    aef248a Remove cmExprParserHelper::SetLineFile()
    e266571 Remove UnionsAvailable member from 2 classes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aef248a4ff675aeb4af6aa44322bed76f4bcf990
commit aef248a4ff675aeb4af6aa44322bed76f4bcf990
Author:     Yury G. Kudryashov <urkud.urkud at gmail.com>
AuthorDate: Wed Feb 29 21:56:13 2012 +0400
Commit:     Yury G. Kudryashov <urkud.urkud at gmail.com>
CommitDate: Sat Mar 3 15:11:09 2012 +0400

    Remove cmExprParserHelper::SetLineFile()

diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx
index ee37352..7728d74 100644
--- a/Source/cmExprParserHelper.cxx
+++ b/Source/cmExprParserHelper.cxx
@@ -30,12 +30,6 @@ cmExprParserHelper::~cmExprParserHelper()
   this->CleanupParser();
 }
 
-void cmExprParserHelper::SetLineFile(long line, const char* file)
-{
-  this->FileLine = line;
-  this->FileName = file;
-}
-
 int cmExprParserHelper::ParseString(const char* str, int verb)
 {
   if ( !str)
diff --git a/Source/cmExprParserHelper.h b/Source/cmExprParserHelper.h
index f3fd4f6..690426d 100644
--- a/Source/cmExprParserHelper.h
+++ b/Source/cmExprParserHelper.h
@@ -46,8 +46,6 @@ public:
 
   int GetResult() { return this->Result; }
 
-  void SetLineFile(long line, const char* file);
-
   const char* GetError() { return this->ErrorString.c_str(); }
 
 private:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e26657103fa95b2a898e438ec6eb982a3c0bf3cc
commit e26657103fa95b2a898e438ec6eb982a3c0bf3cc
Author:     Yury G. Kudryashov <urkud.urkud at gmail.com>
AuthorDate: Wed Feb 29 17:44:02 2012 +0400
Commit:     Yury G. Kudryashov <urkud.urkud at gmail.com>
CommitDate: Sat Mar 3 15:11:08 2012 +0400

    Remove UnionsAvailable member from 2 classes
    
    These classes were copied from cmDependsJavaParserHelper that really needs this
    member.

diff --git a/Source/cmCommandArgumentParserHelper.h b/Source/cmCommandArgumentParserHelper.h
index a211e95..cdb832b 100644
--- a/Source/cmCommandArgumentParserHelper.h
+++ b/Source/cmCommandArgumentParserHelper.h
@@ -81,7 +81,6 @@ private:
   cmStdString InputBuffer;
   std::vector<char> OutputBuffer;
   int CurrentLine;
-  int UnionsAvailable;
   int Verbose;
 
   void Print(const char* place, const char* str);
diff --git a/Source/cmExprParserHelper.h b/Source/cmExprParserHelper.h
index 0c36b44..f3fd4f6 100644
--- a/Source/cmExprParserHelper.h
+++ b/Source/cmExprParserHelper.h
@@ -55,7 +55,6 @@ private:
   cmStdString InputBuffer;
   std::vector<char> OutputBuffer;
   int CurrentLine;
-  int UnionsAvailable;
   int Verbose;
 
   void Print(const char* place, const char* str);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommandArgumentParserHelper.h |    1 -
 Source/cmExprParserHelper.cxx          |    6 ------
 Source/cmExprParserHelper.h            |    3 ---
 3 files changed, 0 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake