diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-15 14:54:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-15 14:54:04 (GMT) |
| commit | 4ecc392b42e999e3e103eac0c0e28fa63c39167c (patch) | |
| tree | afc707f7434f8fbf617c2960e7e8f8d90fffc866 /Source/cmOrderDirectories.cxx | |
| parent | 6418eef222304db9a884a3cf101f86c2eabfb503 (diff) | |
| parent | 65b81da458614c6a4652ea2e4fc933893c671281 (diff) | |
| download | CMake-4ecc392b42e999e3e103eac0c0e28fa63c39167c.zip CMake-4ecc392b42e999e3e103eac0c0e28fa63c39167c.tar.gz CMake-4ecc392b42e999e3e103eac0c0e28fa63c39167c.tar.bz2 | |
Merge topic 'delete-algorithm'
65b81da4 cmVariableWatch: Use the cmDeleteAll algorithm with for_each.
30d2de9a cmGeneratorExpressionEvaluator: Replace own algorithm with cmDeleteAll.
4a6e795b Use the cmDeleteAll algorithm instead of trivial raw loops.
abb4a678 Add a generic algorithm for deleting items in a container.
Diffstat (limited to 'Source/cmOrderDirectories.cxx')
| -rw-r--r-- | Source/cmOrderDirectories.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx index 116d42f..23f8526 100644 --- a/Source/cmOrderDirectories.cxx +++ b/Source/cmOrderDirectories.cxx @@ -291,18 +291,8 @@ cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg, //---------------------------------------------------------------------------- cmOrderDirectories::~cmOrderDirectories() { - for(std::vector<cmOrderDirectoriesConstraint*>::iterator - i = this->ConstraintEntries.begin(); - i != this->ConstraintEntries.end(); ++i) - { - delete *i; - } - for(std::vector<cmOrderDirectoriesConstraint*>::iterator - i = this->ImplicitDirEntries.begin(); - i != this->ImplicitDirEntries.end(); ++i) - { - delete *i; - } + cmDeleteAll(this->ConstraintEntries); + cmDeleteAll(this->ImplicitDirEntries); } //---------------------------------------------------------------------------- |