[Cmake-commits] CMake branch, next, updated. v2.8.8-3202-g2723391

[Peter Kuemmel]

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  27233915aa7d1e08d150805ffef8458a94a3b9a6 (commit)
       via  9081e3a1355bf312e54b4a71e879a72e93933ef0 (commit)
       via  f430bea11b47327f582ca1609c9f0cec0204d628 (commit)
       via  f2c12887ba9fcde6c1f70ade72d231d131d172e5 (commit)
      from  c97752fcf55029c6c95d69f7945cf11cb7d3083b (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=27233915aa7d1e08d150805ffef8458a94a3b9a6
commit 27233915aa7d1e08d150805ffef8458a94a3b9a6
Merge: c97752f 9081e3a
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Jun 16 06:58:57 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 16 06:58:57 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    9081e3a remove warning about unused parameter
    f430bea Ninja: maybe this fixes the bcc32 build
    f2c1288 Ninja: msvc6 for-scoping


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9081e3a1355bf312e54b4a71e879a72e93933ef0
commit 9081e3a1355bf312e54b4a71e879a72e93933ef0
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Jun 16 12:58:06 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sat Jun 16 12:58:06 2012 +0200

    remove warning about unused parameter

diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index fe3c8ca..274274a 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -206,7 +206,7 @@ public:
 
   // Fill the vector with the target names for the object files,
   // preprocessed files and assembly files.
-  virtual void GetIndividualFileTargets(std::vector<std::string>& targets) {}
+  virtual void GetIndividualFileTargets(std::vector<std::string>&) {}
 
   // Create a struct to hold the varibles passed into
   // ExpandRuleVariables

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f430bea11b47327f582ca1609c9f0cec0204d628
commit f430bea11b47327f582ca1609c9f0cec0204d628
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Jun 16 12:54:10 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sat Jun 16 12:54:10 2012 +0200

    Ninja: maybe this fixes the bcc32 build

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 356e214..bf5a17b 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -23,6 +23,7 @@
 #include <vector>
 #include <queue>
 #include <cstdio>
+#include <algorithm>
 
 
 #ifdef _WIN32

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2c12887ba9fcde6c1f70ade72d231d131d172e5
commit f2c12887ba9fcde6c1f70ade72d231d131d172e5
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Jun 16 12:51:25 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sat Jun 16 12:51:25 2012 +0200

    Ninja: msvc6 for-scoping

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index d62bd90..356e214 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -448,17 +448,17 @@ Subprocess* SubprocessSet::NextFinished() {
 }
 
 void SubprocessSet::Clear() {
-  for (std::vector<Subprocess*>::iterator i = running_.begin();
-       i != running_.end(); ++i) {
-    if ((*i)->child_.hProcess) {
+  std::vector<Subprocess*>::iterator it = running_.begin();
+  for (; it != running_.end(); ++it) {
+    if ((*it)->child_.hProcess) {
       if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT,
-                                    (*i)->child_.dwProcessId))
+                                    (*it)->child_.dwProcessId))
         Win32Fatal("GenerateConsoleCtrlEvent");
       }
   }
-  for (std::vector<Subprocess*>::iterator i = running_.begin();
-       i != running_.end(); ++i)
-    delete *i;
+  it = running_.begin();
+  for (; it != running_.end(); ++it)
+    delete *it;
   running_.clear();
 }
 

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

Summary of changes:
 Source/cmLocalGenerator.h |    2 +-
 Source/cmcldeps.cxx       |   15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake