summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestBuildHandler.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-12 13:57:37 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-01-12 13:57:37 (GMT)
commit6c61ffaf9b1616e6938b78ca19f17f9a9f87f3ec (patch)
treecca0a21d897711acddc7679198deb48d82ba8f99 /Source/CTest/cmCTestBuildHandler.cxx
parent9fced518582afcb0875648a278821f7b82f536f4 (diff)
parent3660d063bc005aa13e7ee4836aef842a91cc87f1 (diff)
downloadCMake-6c61ffaf9b1616e6938b78ca19f17f9a9f87f3ec.zip
CMake-6c61ffaf9b1616e6938b78ca19f17f9a9f87f3ec.tar.gz
CMake-6c61ffaf9b1616e6938b78ca19f17f9a9f87f3ec.tar.bz2
Merge topic 'sun-better-stdlib'
3660d063 cmTarget: Use insert instead of std::copy. 5c28495f Help: Remove documented restriction on template use. ac3d3829 Help: Remove documented restriction on find in conditions. 36b8de56 Help: Remove documented restriction on insert APIs. 6162c919 Use two-iterator std::set::insert where appropriate. 238dd2fb Use insert instead of a loop in some cases. 2f7ef7e3 Revert "Misc. fixes for the Oracle / Sun compiler." 4c69ec6f SolarisStudio: Use alternative standard library to build CMake.
Diffstat (limited to 'Source/CTest/cmCTestBuildHandler.cxx')
-rw-r--r--Source/CTest/cmCTestBuildHandler.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index d226a6c..5e7d764 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -1094,11 +1094,8 @@ void cmCTestBuildHandler::ProcessBuffer(const char* data, int length,
{
// Create a contiguous array for the line
this->CurrentProcessingLine.clear();
- t_BuildProcessingQueueType::iterator cit;
- for ( cit = queue->begin(); cit != it; ++cit )
- {
- this->CurrentProcessingLine.push_back(*cit);
- }
+ this->CurrentProcessingLine.insert(this->CurrentProcessingLine.end(),
+ queue->begin(), queue->end());
this->CurrentProcessingLine.push_back(0);
const char* line = &*this->CurrentProcessingLine.begin();