aboutsummaryrefslogtreecommitdiff
path: root/src/support
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-03-03 15:48:18 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2017-03-03 15:48:53 +0100
commit75d012e8c7d0b2dfec0fe34807eabb4f661f4fb7 (patch)
tree068cbf16562b5cfbb1887ffb55385a5f12b76059 /src/support
parentba80a684cfef95233330de58af92ec4baec875fd (diff)
parentad1ae7ae2e90a29fcfaaddee2d5acd025de72cbe (diff)
Merge #8808: Do not shadow variables (gcc set)
ad1ae7a Check and enable -Wshadow by default. (Pavel Janík) 9de90bb Do not shadow variables (gcc set) (Pavel Janík) Tree-SHA512: 9517feb423dc8ddd63896016b25324673bfbe0bffa97f22996f59d7a3fcbdc2ebf2e43ac02bc067546f54e293e9b2f2514be145f867321e9031f895c063d9fb8
Diffstat (limited to 'src/support')
-rw-r--r--src/support/lockedpool.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
index 01273c9791..98c1581093 100644
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -357,8 +357,8 @@ LockedPool::LockedPageArena::~LockedPageArena()
/*******************************************************************************/
// Implementation: LockedPoolManager
//
-LockedPoolManager::LockedPoolManager(std::unique_ptr<LockedPageAllocator> allocator):
- LockedPool(std::move(allocator), &LockedPoolManager::LockingFailed)
+LockedPoolManager::LockedPoolManager(std::unique_ptr<LockedPageAllocator> allocator_in):
+ LockedPool(std::move(allocator_in), &LockedPoolManager::LockingFailed)
{
}