diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-08-16 15:54:51 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-08-16 15:55:48 +0200 |
| commit | c484ec6c9b85ca4e331e395c564ae232fd0681dd (patch) | |
| tree | be4837f43af4a7fb2c48753849bb3e7a9b776387 /src/support/lockedpool.h | |
| parent | d451d0bcf15d8025c3e963df033f918d646aff6a (diff) | |
| parent | 36d326e8b0866df4e70f81c2aa0a2e19d544399c (diff) | |
Merge #10645: Use nullptr (C++11) instead of zero (0) as the null pointer constant
36d326e8b Use nullptr instead of zero (0) as the null pointer constant (practicalswift)
Pull request description:
Use `nullptr` instead of zero (0) as the null pointer constant.
The road towards `nullptr` (C++11) is split into two PRs:
* `NULL` → `nullptr` is handled in PR #10483 (scripted)
* `0` → `nullptr` is handled in PR #10645 (manual, this PR)
By using the C++11 keyword `nullptr` we are guaranteed a prvalue of type `std::nullptr_t`.
For a more thorough discussion, see "A name for the null pointer: nullptr" (Sutter &
Stroustrup), http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf
Tree-SHA512: 5412404b40a94ea2d9fc8f81573559c4ffe559749301d486b09d41a7a736345ad602d08ac590930bb00a49692b6075520cf3d543e4da6ccd5b29fa9bcc3f15ea
Diffstat (limited to 'src/support/lockedpool.h')
| -rw-r--r-- | src/support/lockedpool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h index f5212bc266..7641d81471 100644 --- a/src/support/lockedpool.h +++ b/src/support/lockedpool.h @@ -150,7 +150,7 @@ public: * If this callback is provided and returns false, the allocation fails (hard fail), if * it returns true the allocation proceeds, but it could warn. */ - LockedPool(std::unique_ptr<LockedPageAllocator> allocator, LockingFailed_Callback lf_cb_in = 0); + LockedPool(std::unique_ptr<LockedPageAllocator> allocator, LockingFailed_Callback lf_cb_in = nullptr); ~LockedPool(); /** Allocate size bytes from this arena. |