[Cmake-commits] CMake branch, next, updated. v2.8.7-3053-g234216a

[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  234216ad5221518f03b830d351eb6e3733964487 (commit)
       via  89403bf87f21d9bccb9c73afb5df914cb88ec9ee (commit)
      from  d8adfc2f12b866396f56b2fae89987dafe370734 (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=234216ad5221518f03b830d351eb6e3733964487
commit 234216ad5221518f03b830d351eb6e3733964487
Merge: d8adfc2 89403bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 5 08:36:07 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 5 08:36:07 2012 -0500

    Merge topic 'rename-used-commands' into next
    
    89403bf Rename UsedCommands to FinalPassCommands


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89403bf87f21d9bccb9c73afb5df914cb88ec9ee
commit 89403bf87f21d9bccb9c73afb5df914cb88ec9ee
Author:     Yury G. Kudryashov <urkud.urkud at gmail.com>
AuthorDate: Wed Feb 29 11:49:42 2012 +0400
Commit:     Yury G. Kudryashov <urkud.urkud at gmail.com>
CommitDate: Wed Feb 29 11:49:42 2012 +0400

    Rename UsedCommands to FinalPassCommands
    
    When I read 'UsedCommands' I thought that it holds all commands used in the
    file, not only those that have FinalPass().

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fdf5b31..a715f06 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -210,9 +210,9 @@ cmMakefile::~cmMakefile()
     {
     delete *i;
     }
-  for(unsigned int i=0; i < this->UsedCommands.size(); i++)
+  for(unsigned int i=0; i < this->FinalPassCommands.size(); i++)
     {
-    delete this->UsedCommands[i];
+    delete this->FinalPassCommands[i];
     }
   std::vector<cmFunctionBlocker*>::iterator pos;
   for (pos = this->FunctionBlockers.begin();
@@ -421,7 +421,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
       else if(pcmd->HasFinalPass())
         {
         // use the command
-        this->UsedCommands.push_back(pcmd.release());
+        this->FinalPassCommands.push_back(pcmd.release());
         }
       }
     else if ( this->GetCMakeInstance()->GetWorkingMode() == cmake::SCRIPT_MODE
@@ -813,8 +813,8 @@ void cmMakefile::FinalPass()
 
   // give all the commands a chance to do something
   // after the file has been parsed before generation
-  for(std::vector<cmCommand*>::iterator i = this->UsedCommands.begin();
-      i != this->UsedCommands.end(); ++i)
+  for(std::vector<cmCommand*>::iterator i = this->FinalPassCommands.begin();
+      i != this->FinalPassCommands.end(); ++i)
     {
     (*i)->FinalPass();
     }
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 1c46a73..f1f318a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -620,12 +620,6 @@ public:
    */
   bool CanIWriteThisFile(const char* fileName);
 
-  /**
-   * Get the vector of used command instances.
-   */
-  const std::vector<cmCommand*>& GetUsedCommands() const
-    {return this->UsedCommands;}
-
 #if defined(CMAKE_BUILD_WITH_CMAKE)
   /**
    * Get the vector source groups.
@@ -913,7 +907,7 @@ protected:
   std::vector<cmSourceGroup> SourceGroups;
 #endif
 
-  std::vector<cmCommand*> UsedCommands;
+  std::vector<cmCommand*> FinalPassCommands;
   cmLocalGenerator* LocalGenerator;
   bool IsFunctionBlocked(const cmListFileFunction& lff,
                          cmExecutionStatus &status);

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

Summary of changes:
 Source/cmMakefile.cxx |   10 +++++-----
 Source/cmMakefile.h   |    8 +-------
 2 files changed, 6 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake