diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-12 13:57:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-12 13:57:37 (GMT) |
| commit | 6c61ffaf9b1616e6938b78ca19f17f9a9f87f3ec (patch) | |
| tree | cca0a21d897711acddc7679198deb48d82ba8f99 /Source/cmMacroCommand.cxx | |
| parent | 9fced518582afcb0875648a278821f7b82f536f4 (diff) | |
| parent | 3660d063bc005aa13e7ee4836aef842a91cc87f1 (diff) | |
| download | CMake-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/cmMacroCommand.cxx')
| -rw-r--r-- | Source/cmMacroCommand.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index ae81c58..d399313 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -328,11 +328,7 @@ bool cmMacroCommand::InitialPass(std::vector<std::string> const& args, // create a function blocker cmMacroFunctionBlocker *f = new cmMacroFunctionBlocker(); - for(std::vector<std::string>::const_iterator j = args.begin(); - j != args.end(); ++j) - { - f->Args.push_back(*j); - } + f->Args.insert(f->Args.end(), args.begin(), args.end()); this->Makefile->AddFunctionBlocker(f); return true; } |