[Cmake-commits] CMake branch, next, updated. v2.8.12-4469-g5e249f8

[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  5e249f80dcd2e66d62293c8d6aa792d13bf85227 (commit)
       via  2156a4816bacab2ff23f93327c8e597034398fdc (commit)
      from  89bc83d8c9e8dad80037c32828dcf5d933a5726f (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=5e249f80dcd2e66d62293c8d6aa792d13bf85227
commit 5e249f80dcd2e66d62293c8d6aa792d13bf85227
Merge: 89bc83d 2156a48
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Oct 24 12:03:24 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 24 12:03:24 2013 -0400

    Merge topic 'ctest-fix-run-serial' into next
    
    2156a48 CTest: some compilers don't like range insert; use manual insert instead


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2156a4816bacab2ff23f93327c8e597034398fdc
commit 2156a4816bacab2ff23f93327c8e597034398fdc
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Oct 24 18:02:59 2013 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Oct 24 18:02:59 2013 +0200

    CTest: some compilers don't like range insert; use manual insert instead

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 3dd446b..fad189c 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -496,11 +496,20 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
     TestComparator comp(this);
 
     TestList sortedCopy;
-    sortedCopy.insert(sortedCopy.end(), currentSet.begin(), currentSet.end());
+
+    for(TestSet::const_iterator j = currentSet.begin();
+      j != currentSet.end(); ++j)
+      {
+      sortedCopy.push_back(*j);
+      }
+
     std::stable_sort(sortedCopy.begin(), sortedCopy.end(), comp);
 
-    this->SortedTests.insert(this->SortedTests.end(),
-      sortedCopy.begin(), sortedCopy.end());
+    for(TestList::const_iterator j = sortedCopy.begin();
+      j != sortedCopy.end(); ++j)
+      {
+      this->SortedTests.push_back(*j);
+      }
     }
 }
 

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

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


hooks/post-receive
-- 
CMake