diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-27 13:25:42 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-27 13:25:54 +0200 |
commit | 920ca1f0bf0b786250e3119a05984e0c2af1350a (patch) | |
tree | 72ffd41a7d512d1a71dd6e8701c3bcb7f9849d5a /src/support | |
parent | 6e54c85439b6ce8913841f384864bef03a138b95 (diff) | |
parent | 4731cab8fbff51a8178c85d572e2482040278616 (diff) |
Merge #8655: Do not shadow variables (trivials)
4731cab Do not shadow variables (Pavel JanÃk)
Diffstat (limited to 'src/support')
-rw-r--r-- | src/support/pagelocker.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/support/pagelocker.h b/src/support/pagelocker.h index 6b3979e551..538bf39453 100644 --- a/src/support/pagelocker.h +++ b/src/support/pagelocker.h @@ -28,11 +28,11 @@ template <class Locker> class LockedPageManagerBase { public: - LockedPageManagerBase(size_t page_size) : page_size(page_size) + LockedPageManagerBase(size_t _page_size) : page_size(_page_size) { // Determine bitmask for extracting page from address - assert(!(page_size & (page_size - 1))); // size must be power of two - page_mask = ~(page_size - 1); + assert(!(_page_size & (_page_size - 1))); // size must be power of two + page_mask = ~(_page_size - 1); } ~LockedPageManagerBase() |