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/cmFileLockPool.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/cmFileLockPool.cxx')
| -rw-r--r-- | Source/cmFileLockPool.cxx | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx index 551a75a..cf8e9a9 100644 --- a/Source/cmFileLockPool.cxx +++ b/Source/cmFileLockPool.cxx @@ -23,16 +23,8 @@ cmFileLockPool::cmFileLockPool() cmFileLockPool::~cmFileLockPool() { - for (It i = this->FunctionScopes.begin(); - i != this->FunctionScopes.end(); ++i) - { - delete *i; - } - - for (It i = this->FileScopes.begin(); i != this->FileScopes.end(); ++i) - { - delete *i; - } + cmDeleteAll(this->FunctionScopes); + cmDeleteAll(this->FileScopes); } void cmFileLockPool::PushFunctionScope() @@ -148,10 +140,7 @@ cmFileLockPool::ScopePool::ScopePool() cmFileLockPool::ScopePool::~ScopePool() { - for (It i = this->Locks.begin(); i != this->Locks.end(); ++i) - { - delete *i; - } + cmDeleteAll(this->Locks); } cmFileLockResult cmFileLockPool::ScopePool::Lock( |