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/bench | |
| 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/bench')
| -rw-r--r-- | src/bench/lockedpool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bench/lockedpool.cpp b/src/bench/lockedpool.cpp index 43a1422795..c6a05567be 100644 --- a/src/bench/lockedpool.cpp +++ b/src/bench/lockedpool.cpp @@ -21,14 +21,14 @@ static void BenchLockedPool(benchmark::State& state) std::vector<void*> addr; for (int x=0; x<ASIZE; ++x) - addr.push_back(0); + addr.push_back(nullptr); uint32_t s = 0x12345678; while (state.KeepRunning()) { for (int x=0; x<BITER; ++x) { int idx = s & (addr.size()-1); if (s & 0x80000000) { b.free(addr[idx]); - addr[idx] = 0; + addr[idx] = nullptr; } else if(!addr[idx]) { addr[idx] = b.alloc((s >> 16) & (MSIZE-1)); } |