[Cmake-commits] CMake branch, next, updated. v3.2.2-3094-g0ddf23c

[Stephen Kelly]

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  0ddf23cfaaa5c4da850129b0678c6169e870cca4 (commit)
       via  64a797f3328dfc6156576b794eec72942215e71a (commit)
       via  641b4fe0f388c71c904f2ea2a9353a1b97d71912 (commit)
      from  363b61c72929985373f63d6a5dc61612b66c82ff (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=0ddf23cfaaa5c4da850129b0678c6169e870cca4
commit 0ddf23cfaaa5c4da850129b0678c6169e870cca4
Merge: 363b61c 64a797f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 05:09:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 24 05:09:51 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    64a797f3 foreach: Remove unused variables.
    641b4fe0 cmGlobalGenerator: De-virtualize TryCompile.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64a797f3328dfc6156576b794eec72942215e71a
commit 64a797f3328dfc6156576b794eec72942215e71a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 11:07:53 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 11:09:22 2015 +0200

    foreach: Remove unused variables.

diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index 8e3510d..0dcda4d 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -44,8 +44,6 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
       std::vector<std::string>::const_iterator j = this->Args.begin();
       ++j;
 
-      std::string tmps;
-      cmListFileArgument arg;
       for( ; j != this->Args.end(); ++j)
         {
         // set the variable to the loop value

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=641b4fe0f388c71c904f2ea2a9353a1b97d71912
commit 641b4fe0f388c71c904f2ea2a9353a1b97d71912
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 11:08:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 11:09:21 2015 +0200

    cmGlobalGenerator: De-virtualize TryCompile.

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index e8714ef..56574b8 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -121,7 +121,7 @@ public:
    * Try running cmake and building a file. This is used for dynamically
    * loaded commands, not as part of the usual build process.
    */
-  virtual int TryCompile(const std::string& srcdir, const std::string& bindir,
+  int TryCompile(const std::string& srcdir, const std::string& bindir,
                          const std::string& projectName,
                          const std::string& targetName,
                          bool fast, std::string& output, cmMakefile* mf);

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

Summary of changes:
 Source/cmForEachCommand.cxx |    2 --
 Source/cmGlobalGenerator.h  |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
CMake