diff options
| author | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-04-28 13:09:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 13:09:34 +0200 |
| commit | fc9c8ec3a2aa9e433dc12e67e0ed5d72353e8f3d (patch) | |
| tree | 7fbf9c911c4ca68ae40f1f1872944cd3478316fd /storageframework/src/tests/memory/memorymanagertest.cpp | |
| parent | ff9c5764ce454d356f8faf727905cd9b67c82f94 (diff) | |
| parent | d336400e3e95685d62ec05c09e1582c3abcb34fc (diff) | |
Merge pull request #2307 from yahoo/balder/no-virtual-on-override-for-some-minor-storagemodules
no virtual on override + optimize includes.
Diffstat (limited to 'storageframework/src/tests/memory/memorymanagertest.cpp')
| -rw-r--r-- | storageframework/src/tests/memory/memorymanagertest.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storageframework/src/tests/memory/memorymanagertest.cpp b/storageframework/src/tests/memory/memorymanagertest.cpp index 885ae86e832..8b1868a6bd4 100644 --- a/storageframework/src/tests/memory/memorymanagertest.cpp +++ b/storageframework/src/tests/memory/memorymanagertest.cpp @@ -155,8 +155,7 @@ MemoryManagerTest::testBasics() struct ReduceI : public framework::ReduceMemoryUsageInterface { framework::MemoryToken::UP _token; - virtual uint64_t reduceMemoryConsumption(const MemoryToken& token, uint64_t reduceBy) override - { + uint64_t reduceMemoryConsumption(const MemoryToken& token, uint64_t reduceBy) override { assert(&token == _token.get()); (void) &token; assert(_token->getSize() >= reduceBy); |