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/cmGlobalNinjaGenerator.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/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 6f0586b..07ea942 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1021,12 +1021,9 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os) } //insert outputs from all WirteBuild commands - for(std::set<std::string>::iterator i = this->CombinedBuildOutputs.begin(); - i != this->CombinedBuildOutputs.end(); ++i) - { - //these paths have already be encoded when added to CombinedBuildOutputs - knownDependencies.insert(*i); - } + //these paths have already be encoded when added to CombinedBuildOutputs + knownDependencies.insert(this->CombinedBuildOutputs.begin(), + this->CombinedBuildOutputs.end()); //after we have combined the data into knownDependencies we have no need //to keep this data around |