diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-06-28 14:33:44 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-06-28 15:05:23 +0200 |
| commit | 9a941a10101dc720d7d8b425f7778abf2a1b7c36 (patch) | |
| tree | b70c32af24d1a318dfcd39bb63e1e472566733ef /src/test/allocator_tests.cpp | |
| parent | Merge #10684: Remove no longer used mempool.exists(outpoint) (diff) | |
| parent | Use the override specifier (C++11) where we expect to be overriding the virtu... (diff) | |
| download | discoin-9a941a10101dc720d7d8b425f7778abf2a1b7c36.tar.xz discoin-9a941a10101dc720d7d8b425f7778abf2a1b7c36.zip | |
Merge #10631: Use the override specifier (C++11) where we expect to be overriding the virtual function of a base class
aa95947 Use the override specifier (C++11) where we expect to be overriding the virtual function of a base class (practicalswift)
Tree-SHA512: 3835e9b4ceaa4b2db485a25dfa3e5fe50c2e3ecb22ca9d5331aed7728aa496d4378fb84c0a1a3c47b0adecc10a00bca99cc239cbaf94cf2ce5b4cda497db6023
Diffstat (limited to 'src/test/allocator_tests.cpp')
| -rw-r--r-- | src/test/allocator_tests.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp index 3f15a0dec..4a533b5bf 100644 --- a/src/test/allocator_tests.cpp +++ b/src/test/allocator_tests.cpp @@ -131,7 +131,7 @@ class TestLockedPageAllocator: public LockedPageAllocator { public: TestLockedPageAllocator(int count_in, int lockedcount_in): count(count_in), lockedcount(lockedcount_in) {} - void* AllocateLocked(size_t len, bool *lockingSuccess) + void* AllocateLocked(size_t len, bool *lockingSuccess) override { *lockingSuccess = false; if (count > 0) { @@ -146,10 +146,10 @@ public: } return 0; } - void FreeLocked(void* addr, size_t len) + void FreeLocked(void* addr, size_t len) override { } - size_t GetLimit() + size_t GetLimit() override { return std::numeric_limits<size_t>::max(); } |