[Cmake-commits] CMake branch, next, updated. v2.8.12-4499-gd9518a3

[Nils Gladitz]

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  d9518a356968b257586664de5c3667db0beef0c8 (commit)
       via  2ad01e6f39932148fdd23a9f5f91200c75c2eca1 (commit)
      from  3454c7404f2e23ab3a127cbb52dcc5c0ca66e139 (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=d9518a356968b257586664de5c3667db0beef0c8
commit d9518a356968b257586664de5c3667db0beef0c8
Merge: 3454c74 2ad01e6
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Oct 25 12:06:08 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 25 12:06:08 2013 -0400

    Merge topic 'ctest-fix-run-serial' into next
    
    2ad01e6 CTest: replace one more range insert which VS6 seems to dislike


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ad01e6f39932148fdd23a9f5f91200c75c2eca1
commit 2ad01e6f39932148fdd23a9f5f91200c75c2eca1
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Oct 25 15:11:59 2013 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Oct 25 15:11:59 2013 +0200

    CTest: replace one more range insert which VS6 seems to dislike

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index fad189c..283a072 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -474,7 +474,11 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
       i != previousSet.end(); ++i)
       {
       TestSet const& dependencies = this->Tests[*i];
-      currentSet.insert(dependencies.begin(), dependencies.end());
+      for(TestSet::iterator j = dependencies.begin();
+        j != dependencies.end(); ++j)
+        {
+        currentSet.insert(*j);
+        }
       }
 
     for(TestSet::iterator i = currentSet.begin();

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

Summary of changes:
 Source/CTest/cmCTestMultiProcessHandler.cxx |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake