[Cmake-commits] CMake branch, next, updated. v3.1.0-1264-g6213867
Stephen Kelly
steveire at gmail.com
Thu Dec 18 15:46:13 EST 2014
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 6213867925e250e12d4143dbabc26842a7f2c83e (commit)
via 3b2a58f91633c2eb5e52fbaab4055132e4a05cbe (commit)
from 6eb86e6d11bbcb7a6eaa38de2f79519c7f0a2ff9 (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=6213867925e250e12d4143dbabc26842a7f2c83e
commit 6213867925e250e12d4143dbabc26842a7f2c83e
Merge: 6eb86e6 3b2a58f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 18 15:46:12 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 18 15:46:12 2014 -0500
Merge topic 'use-insert-with-iterators' into next
3b2a58f9 Revert topic.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b2a58f91633c2eb5e52fbaab4055132e4a05cbe
commit 3b2a58f91633c2eb5e52fbaab4055132e4a05cbe
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 18 21:45:34 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Dec 18 21:45:44 2014 +0100
Revert topic.
Forgot about the topic freeze.
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 5e7d764..d226a6c 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -1094,8 +1094,11 @@ void cmCTestBuildHandler::ProcessBuffer(const char* data, int length,
{
// Create a contiguous array for the line
this->CurrentProcessingLine.clear();
- this->CurrentProcessingLine.insert(this->CurrentProcessingLine.end(),
- queue->begin(), queue->end());
+ t_BuildProcessingQueueType::iterator cit;
+ for ( cit = queue->begin(); cit != it; ++cit )
+ {
+ this->CurrentProcessingLine.push_back(*cit);
+ }
this->CurrentProcessingLine.push_back(0);
const char* line = &*this->CurrentProcessingLine.begin();
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 97637ed..4c89caa 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -526,8 +526,11 @@ void cmCTestMultiProcessHandler::CreateParallelTestCostList()
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);
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index 52b98d7..0bb1a99 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@ -349,7 +349,11 @@ void cmCTestP4::SetP4Options(std::vector<char const*> &CommandOptions)
std::vector<std::string> args =
cmSystemTools::ParseArguments(opts.c_str());
- P4Options.insert(P4Options.end(), args.begin(), args.end());
+ for(std::vector<std::string>::const_iterator ai = args.begin();
+ ai != args.end(); ++ai)
+ {
+ P4Options.push_back(*ai);
+ }
}
CommandOptions.clear();
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index 4aa8d04..07a994d 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -74,8 +74,13 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
std::vector<std::string> notesFiles;
cmCTest::VectorOfStrings newNotesFiles;
cmSystemTools::ExpandListArgument(notesFilesVariable,notesFiles);
- newNotesFiles.insert(newNotesFiles.end(),
- notesFiles.begin(), notesFiles.end());
+ std::vector<std::string>::iterator it;
+ for ( it = notesFiles.begin();
+ it != notesFiles.end();
+ ++ it )
+ {
+ newNotesFiles.push_back(*it);
+ }
this->CTest->GenerateNotesFile(newNotesFiles);
}
@@ -86,8 +91,13 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
std::vector<std::string> extraFiles;
cmCTest::VectorOfStrings newExtraFiles;
cmSystemTools::ExpandListArgument(extraFilesVariable,extraFiles);
- newExtraFiles.insert(newExtraFiles.end(),
- extraFiles.begin(), extraFiles.end());
+ std::vector<std::string>::iterator it;
+ for ( it = extraFiles.begin();
+ it != extraFiles.end();
+ ++ it )
+ {
+ newExtraFiles.push_back(*it);
+ }
if ( !this->CTest->SubmitExtraFiles(newExtraFiles))
{
this->SetError("problem submitting extra files.");
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 78f1fd4..f330e58 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -2153,11 +2153,25 @@ bool cmCTestTestHandler::SetTestsProperties(
}
if ( key == "ATTACHED_FILES" )
{
- cmSystemTools::ExpandListArgument(val, rtit->AttachedFiles);
+ std::vector<std::string> lval;
+ cmSystemTools::ExpandListArgument(val, lval);
+
+ for(std::vector<std::string>::iterator f = lval.begin();
+ f != lval.end(); ++f)
+ {
+ rtit->AttachedFiles.push_back(*f);
+ }
}
if ( key == "ATTACHED_FILES_ON_FAIL" )
{
- cmSystemTools::ExpandListArgument(val, rtit->AttachOnFail);
+ std::vector<std::string> lval;
+ cmSystemTools::ExpandListArgument(val, lval);
+
+ for(std::vector<std::string>::iterator f = lval.begin();
+ f != lval.end(); ++f)
+ {
+ rtit->AttachOnFail.push_back(*f);
+ }
}
if ( key == "RESOURCE_LOCK" )
{
@@ -2181,7 +2195,14 @@ bool cmCTestTestHandler::SetTestsProperties(
}
if ( key == "REQUIRED_FILES" )
{
- cmSystemTools::ExpandListArgument(val, rtit->RequiredFiles);
+ std::vector<std::string> lval;
+ cmSystemTools::ExpandListArgument(val, lval);
+
+ for(std::vector<std::string>::iterator f = lval.begin();
+ f != lval.end(); ++f)
+ {
+ rtit->RequiredFiles.push_back(*f);
+ }
}
if ( key == "RUN_SERIAL" )
{
@@ -2218,15 +2239,33 @@ bool cmCTestTestHandler::SetTestsProperties(
}
if ( key == "DEPENDS" )
{
- cmSystemTools::ExpandListArgument(val, rtit->Depends);
+ std::vector<std::string> lval;
+ cmSystemTools::ExpandListArgument(val, lval);
+ std::vector<std::string>::iterator crit;
+ for ( crit = lval.begin(); crit != lval.end(); ++ crit )
+ {
+ rtit->Depends.push_back(*crit);
+ }
}
if ( key == "ENVIRONMENT" )
{
- cmSystemTools::ExpandListArgument(val, rtit->Environment);
+ std::vector<std::string> lval;
+ cmSystemTools::ExpandListArgument(val, lval);
+ std::vector<std::string>::iterator crit;
+ for ( crit = lval.begin(); crit != lval.end(); ++ crit )
+ {
+ rtit->Environment.push_back(*crit);
+ }
}
if ( key == "LABELS" )
{
- cmSystemTools::ExpandListArgument(val, rtit->Labels);
+ std::vector<std::string> lval;
+ cmSystemTools::ExpandListArgument(val, lval);
+ std::vector<std::string>::iterator crit;
+ for ( crit = lval.begin(); crit != lval.end(); ++ crit )
+ {
+ rtit->Labels.push_back(*crit);
+ }
}
if ( key == "MEASUREMENT" )
{
diff --git a/Source/cmAddTestCommand.cxx b/Source/cmAddTestCommand.cxx
index dc3b4c2..2531a1a 100644
--- a/Source/cmAddTestCommand.cxx
+++ b/Source/cmAddTestCommand.cxx
@@ -36,7 +36,11 @@ bool cmAddTestCommand
// Collect the command with arguments.
std::vector<std::string> command;
- command.insert(command.end(), args.begin() + 1, args.end());
+ for(std::vector<std::string>::const_iterator it = args.begin() + 1;
+ it != args.end(); ++it)
+ {
+ command.push_back(*it);
+ }
// Create the test but add a generator only the first time it is
// seen. This preserves behavior from before test generators.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 80dbaf3..2bf7b77 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2598,14 +2598,16 @@ void cmCTest::PopulateCustomVector(cmMakefile* mf, const std::string& def,
return;
}
cmCTestLog(this, DEBUG, "PopulateCustomVector: " << def << std::endl);
+ std::vector<std::string> slist;
+ cmSystemTools::ExpandListArgument(dval, slist);
+ std::vector<std::string>::iterator it;
vec.clear();
- cmSystemTools::ExpandListArgument(dval, vec);
- for (std::vector<std::string>::const_iterator it = vec.begin();
- it != vec.end(); ++it )
+ for ( it = slist.begin(); it != slist.end(); ++it )
{
cmCTestLog(this, DEBUG, " -- " << *it << std::endl);
+ vec.push_back(*it);
}
}
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 7a601e2..aba26de 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -53,7 +53,10 @@ bool cmConditionEvaluator::IsTrue(
cmArgumentList newArgs;
// copy to the list structure
- newArgs.insert(newArgs.end(), args.begin(), args.end());
+ for(unsigned int i = 0; i < args.size(); ++i)
+ {
+ newArgs.push_back(args[i]);
+ }
// now loop through the arguments and see if we can reduce any of them
// we do this multiple times. Once for each level of precedence
@@ -408,7 +411,10 @@ bool cmConditionEvaluator::HandleLevel0(cmArgumentList &newArgs,
// copy to the list structure
cmArgumentList::iterator argP1 = arg;
argP1++;
- newArgs2.insert(newArgs2.end(), argP1, argClose);
+ for(; argP1 != argClose; argP1++)
+ {
+ newArgs2.push_back(*argP1);
+ }
newArgs2.pop_back();
// now recursively invoke IsTrue to handle the values inside the
// parenthetical expression
diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx
index 015825d..2afb029 100644
--- a/Source/cmCustomCommand.cxx
+++ b/Source/cmCustomCommand.cxx
@@ -131,14 +131,21 @@ const char* cmCustomCommand::GetComment() const
//----------------------------------------------------------------------------
void cmCustomCommand::AppendCommands(const cmCustomCommandLines& commandLines)
{
- this->CommandLines.insert(this->CommandLines.end(),
- commandLines.begin(), commandLines.end());
+ for(cmCustomCommandLines::const_iterator i=commandLines.begin();
+ i != commandLines.end(); ++i)
+ {
+ this->CommandLines.push_back(*i);
+ }
}
//----------------------------------------------------------------------------
void cmCustomCommand::AppendDepends(const std::vector<std::string>& depends)
{
- this->Depends.insert(this->Depends.end(), depends.begin(), depends.end());
+ for(std::vector<std::string>::const_iterator i=depends.begin();
+ i != depends.end(); ++i)
+ {
+ this->Depends.push_back(*i);
+ }
}
//----------------------------------------------------------------------------
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 013724e..beb6dde 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -184,8 +184,10 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
std::vector<std::string> shortArgs = this->Names;
this->Names.clear(); // clear out any values in Names
this->Names.push_back(shortArgs[0]);
- this->UserGuessArgs.insert(this->UserGuessArgs.end(),
- shortArgs.begin() + 1, shortArgs.end());
+ for(unsigned int j = 1; j < shortArgs.size(); ++j)
+ {
+ this->UserGuessArgs.push_back(shortArgs[j]);
+ }
}
this->ExpandPaths();
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 488538f..3580374 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -271,7 +271,11 @@ bool cmFunctionCommand
// create a function blocker
cmFunctionFunctionBlocker *f = new cmFunctionFunctionBlocker();
- f->Args.insert(f->Args.end(), args.begin(), args.end());
+ for(std::vector<std::string>::const_iterator j = args.begin();
+ j != args.end(); ++j)
+ {
+ f->Args.push_back(*j);
+ }
this->Makefile->AddFunctionBlocker(f);
return true;
}
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 861122c..b6fe414 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -15,6 +15,8 @@
#include "cmTarget.h"
#include "assert.h"
+#include <cmsys/String.h>
+
#include "cmGeneratorExpressionEvaluator.h"
#include "cmGeneratorExpressionLexer.h"
#include "cmGeneratorExpressionParser.h"
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 435452c..2b531e2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -489,7 +489,11 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
unique.insert(*li);
}
result.clear();
- result.insert(result.end(), unique.begin(), unique.end());
+ for(std::set<std::string>::iterator li = unique.begin();
+ li != unique.end(); ++li)
+ {
+ result.push_back(*li);
+ }
IncludeCacheType::value_type entry(config_upper, result);
iter = this->SystemIncludesCache.insert(entry).first;
diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx
index a007693..f106e1a 100644
--- a/Source/cmInstallFilesCommand.cxx
+++ b/Source/cmInstallFilesCommand.cxx
@@ -47,8 +47,11 @@ bool cmInstallFilesCommand
else
{
this->IsFilesForm = false;
- this->FinalArgs.insert(this->FinalArgs.end(),
- args.begin() + 1, args.end());
+ std::vector<std::string>::const_iterator s = args.begin();
+ for (++s;s != args.end(); ++s)
+ {
+ this->FinalArgs.push_back(*s);
+ }
}
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx
index cc223ab..0405769 100644
--- a/Source/cmInstallProgramsCommand.cxx
+++ b/Source/cmInstallProgramsCommand.cxx
@@ -27,7 +27,11 @@ bool cmInstallProgramsCommand
this->Destination = args[0];
- this->FinalArgs.insert(this->FinalArgs.end(), args.begin() + 1, args.end());
+ std::vector<std::string>::const_iterator s = args.begin();
+ for (++s;s != args.end(); ++s)
+ {
+ this->FinalArgs.push_back(*s);
+ }
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
->AddInstallComponent(this->Makefile->GetSafeDefinition(
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index a4185ad..2de6c93 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -634,7 +634,11 @@ void cmLocalGenerator::AddCustomCommandToCreateObject(const char* ofname,
// Parse the string to get the custom command line.
cmCustomCommandLine commandLine;
std::vector<std::string> cmd = cmSystemTools::ParseArguments(i->c_str());
- commandLine.insert(commandLine.end(), cmd.begin(), cmd.end());
+ for(std::vector<std::string>::iterator a = cmd.begin();
+ a != cmd.end(); ++a)
+ {
+ commandLine.push_back(*a);
+ }
// Store this command line.
commandLines.push_back(commandLine);
@@ -741,7 +745,11 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang,
// Parse the string to get the custom command line.
cmCustomCommandLine commandLine;
std::vector<std::string> cmd = cmSystemTools::ParseArguments(i->c_str());
- commandLine.insert(commandLine.end(), cmd.begin(), cmd.end());
+ for(std::vector<std::string>::iterator a = cmd.begin();
+ a != cmd.end(); ++a)
+ {
+ commandLine.push_back(*a);
+ }
// Store this command line.
commandLines.push_back(commandLine);
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 96beb1c..812ded3 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1856,8 +1856,13 @@ void cmLocalUnixMakefileGenerator3
{
text = "Running external command ...";
}
- depends.insert(depends.end(), glIt->second.GetUtilities().begin(),
- glIt->second.GetUtilities().end());
+ std::set<std::string>::const_iterator dit;
+ for ( dit = glIt->second.GetUtilities().begin();
+ dit != glIt->second.GetUtilities().end();
+ ++ dit )
+ {
+ depends.push_back(*dit);
+ }
this->AppendEcho(commands, text,
cmLocalUnixMakefileGenerator3::EchoGlobal);
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index d399313..ae81c58 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -328,7 +328,11 @@ bool cmMacroCommand::InitialPass(std::vector<std::string> const& args,
// create a function blocker
cmMacroFunctionBlocker *f = new cmMacroFunctionBlocker();
- f->Args.insert(f->Args.end(), args.begin(), args.end());
+ for(std::vector<std::string>::const_iterator j = args.begin();
+ j != args.end(); ++j)
+ {
+ f->Args.push_back(*j);
+ }
this->Makefile->AddFunctionBlocker(f);
return true;
}
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 25d5881..20dae5a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2567,7 +2567,12 @@ std::vector<std::string> cmMakefile
}
std::vector<std::string> res;
- res.insert(res.end(), definitions.begin(), definitions.end());
+
+ std::set<std::string>::iterator fit;
+ for ( fit = definitions.begin(); fit != definitions.end(); fit ++ )
+ {
+ res.push_back(*fit);
+ }
return res;
}
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 040a7d6..067714e 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -759,10 +759,13 @@ cmMakefileTargetGenerator
if(const char* extra_outputs_str =
source.GetProperty("OBJECT_OUTPUTS"))
{
- // Register these as extra files to clean.
cmSystemTools::ExpandListArgument(extra_outputs_str, outputs);
- this->CleanFiles.insert(this->CleanFiles.end(),
- outputs.begin() + 1, outputs.end());
+ for(std::vector<std::string>::const_iterator eoi = outputs.begin()+1;
+ eoi != outputs.end(); ++eoi)
+ {
+ // Register this as an extra file to clean.
+ this->CleanFiles.push_back(*eoi);
+ }
}
// Write the rule.
@@ -1171,7 +1174,11 @@ cmMakefileTargetGenerator
{
cmCustomCommandGenerator ccg(*cc, this->ConfigName, this->Makefile);
const std::vector<std::string>& outputs = ccg.GetOutputs();
- depends.insert(depends.end(), outputs.begin(), outputs.end());
+ for(std::vector<std::string>::const_iterator o = outputs.begin();
+ o != outputs.end(); ++o)
+ {
+ depends.push_back(*o);
+ }
}
}
}
@@ -1186,7 +1193,13 @@ void cmMakefileTargetGenerator
depends.push_back(source.GetFullPath());
if(const char* objectDeps = source.GetProperty("OBJECT_DEPENDS"))
{
- cmSystemTools::ExpandListArgument(objectDeps, depends);
+ std::vector<std::string> deps;
+ cmSystemTools::ExpandListArgument(objectDeps, deps);
+ for(std::vector<std::string>::iterator i = deps.begin();
+ i != deps.end(); ++i)
+ {
+ depends.push_back(*i);
+ }
}
}
@@ -1455,8 +1468,11 @@ void cmMakefileTargetGenerator::WriteTargetDriverRule(
}
// Make sure the extra files are built.
- depends.insert(depends.end(),
- this->ExtraFiles.begin(), this->ExtraFiles.end());
+ for(std::set<std::string>::const_iterator i = this->ExtraFiles.begin();
+ i != this->ExtraFiles.end(); ++i)
+ {
+ depends.push_back(*i);
+ }
}
// Write the driver rule.
@@ -1543,7 +1559,11 @@ void cmMakefileTargetGenerator
if(cmComputeLinkInformation* cli = this->Target->GetLinkInformation(cfg))
{
std::vector<std::string> const& libDeps = cli->GetDepends();
- depends.insert(depends.end(), libDeps.begin(), libDeps.end());
+ for(std::vector<std::string>::const_iterator j = libDeps.begin();
+ j != libDeps.end(); ++j)
+ {
+ depends.push_back(*j);
+ }
}
}
@@ -1563,8 +1583,12 @@ void cmMakefileTargetGenerator
}
// Add dependencies on the external object files.
- depends.insert(depends.end(),
- this->ExternalObjects.begin(), this->ExternalObjects.end());
+ for(std::vector<std::string>::const_iterator obj
+ = this->ExternalObjects.begin();
+ obj != this->ExternalObjects.end(); ++obj)
+ {
+ depends.push_back(*obj);
+ }
// Add a dependency on the rule file itself.
this->LocalGenerator->AppendRuleDepend(depends,
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 443162a..0c38366 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -2188,12 +2188,24 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
std::vector<std::string> command;
command.push_back(this->MocExecutable);
- command.insert(command.end(),
- this->MocIncludes.begin(), this->MocIncludes.end());
- command.insert(command.end(),
- this->MocDefinitions.begin(), this->MocDefinitions.end());
- command.insert(command.end(),
- this->MocOptions.begin(), this->MocOptions.end());
+ for (std::list<std::string>::const_iterator it = this->MocIncludes.begin();
+ it != this->MocIncludes.end();
+ ++it)
+ {
+ command.push_back(*it);
+ }
+ for(std::list<std::string>::const_iterator it=this->MocDefinitions.begin();
+ it != this->MocDefinitions.end();
+ ++it)
+ {
+ command.push_back(*it);
+ }
+ for(std::vector<std::string>::const_iterator it=this->MocOptions.begin();
+ it != this->MocOptions.end();
+ ++it)
+ {
+ command.push_back(*it);
+ }
#ifdef _WIN32
command.push_back("-DWIN32");
#endif
@@ -2265,7 +2277,12 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
cmSystemTools::ExpandListArgument(optionIt->second, fileOpts);
this->MergeUicOptions(opts, fileOpts, this->QtMajorVersion == "5");
}
- command.insert(command.end(), opts.begin(), opts.end());
+ for(std::vector<std::string>::const_iterator optIt = opts.begin();
+ optIt != opts.end();
+ ++optIt)
+ {
+ command.push_back(*optIt);
+ }
command.push_back("-o");
command.push_back(this->Builddir + ui_output_file);
@@ -2351,7 +2368,14 @@ bool cmQtAutoGenerators::GenerateQrc()
= this->RccOptions.find(*si);
if (optionIt != this->RccOptions.end())
{
- cmSystemTools::ExpandListArgument(optionIt->second, command);
+ std::vector<std::string> opts;
+ cmSystemTools::ExpandListArgument(optionIt->second, opts);
+ for(std::vector<std::string>::const_iterator optIt = opts.begin();
+ optIt != opts.end();
+ ++optIt)
+ {
+ command.push_back(*optIt);
+ }
}
command.push_back("-name");
diff --git a/Source/cmRemoveCommand.cxx b/Source/cmRemoveCommand.cxx
index d8aa1cb..bcb8564 100644
--- a/Source/cmRemoveCommand.cxx
+++ b/Source/cmRemoveCommand.cxx
@@ -39,7 +39,10 @@ bool cmRemoveCommand
// check for REMOVE(VAR v1 v2 ... vn)
std::vector<std::string> argsExpanded;
std::vector<std::string> temp;
- temp.insert(temp.end(), args.begin() + 1, args.end());
+ for(unsigned int j = 1; j < args.size(); ++j)
+ {
+ temp.push_back(args[j]);
+ }
cmSystemTools::ExpandList(temp, argsExpanded);
// now create the new value
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 630944e..c83dc2a 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1269,7 +1269,11 @@ bool cmSystemTools::Split(const char* s, std::vector<std::string>& l)
{
std::vector<std::string> temp;
bool res = Superclass::Split(s, temp);
- l.insert(l.end(), temp.begin(), temp.end());
+ for(std::vector<std::string>::const_iterator i = temp.begin();
+ i != temp.end(); ++i)
+ {
+ l.push_back(*i);
+ }
return res;
}
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 56e9258..865a824 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6456,8 +6456,11 @@ cmTargetInternals::ComputeLinkImplementationLanguages(
// Get languages used in our source files.
thisTarget->GetLanguages(languages, config);
// Copy the set of langauges to the link implementation.
- impl.Languages.insert(impl.Languages.begin(),
- languages.begin(), languages.end());
+ for(std::set<std::string>::iterator li = languages.begin();
+ li != languages.end(); ++li)
+ {
+ impl.Languages.push_back(*li);
+ }
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestBuildHandler.cxx | 7 ++--
Source/CTest/cmCTestMultiProcessHandler.cxx | 7 ++--
Source/CTest/cmCTestP4.cxx | 6 +++-
Source/CTest/cmCTestSubmitCommand.cxx | 18 +++++++---
Source/CTest/cmCTestTestHandler.cxx | 51 +++++++++++++++++++++++----
Source/cmAddTestCommand.cxx | 6 +++-
Source/cmCTest.cxx | 8 +++--
Source/cmConditionEvaluator.cxx | 10 ++++--
Source/cmCustomCommand.cxx | 13 +++++--
Source/cmFindBase.cxx | 6 ++--
Source/cmFunctionCommand.cxx | 6 +++-
Source/cmGeneratorExpression.cxx | 2 ++
Source/cmGeneratorTarget.cxx | 6 +++-
Source/cmInstallFilesCommand.cxx | 7 ++--
Source/cmInstallProgramsCommand.cxx | 6 +++-
Source/cmLocalGenerator.cxx | 12 +++++--
Source/cmLocalUnixMakefileGenerator3.cxx | 9 +++--
Source/cmMacroCommand.cxx | 6 +++-
Source/cmMakefile.cxx | 7 +++-
Source/cmMakefileTargetGenerator.cxx | 44 +++++++++++++++++------
Source/cmQtAutoGenerators.cxx | 40 ++++++++++++++++-----
Source/cmRemoveCommand.cxx | 5 ++-
Source/cmSystemTools.cxx | 6 +++-
Source/cmTarget.cxx | 7 ++--
24 files changed, 236 insertions(+), 59 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list