diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2017-04-24 12:10:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-24 12:10:42 +0200 |
commit | 9ff4bdb407ed8d855a3f86a17c99906ff738177b (patch) | |
tree | fc2b050224d7dde92d57e1f9cac12c1e5aaf6b90 /storageframework/src/tests/memory | |
parent | 32ae190acc9ac5081049e1c7008d1602c68cf821 (diff) |
Revert "Balder/enforce override 2"
Diffstat (limited to 'storageframework/src/tests/memory')
-rw-r--r-- | storageframework/src/tests/memory/memorymanagertest.cpp | 3 | ||||
-rw-r--r-- | storageframework/src/tests/memory/memorystatetest.cpp | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/storageframework/src/tests/memory/memorymanagertest.cpp b/storageframework/src/tests/memory/memorymanagertest.cpp index 8b1868a6bd4..885ae86e832 100644 --- a/storageframework/src/tests/memory/memorymanagertest.cpp +++ b/storageframework/src/tests/memory/memorymanagertest.cpp @@ -155,7 +155,8 @@ MemoryManagerTest::testBasics() struct ReduceI : public framework::ReduceMemoryUsageInterface { framework::MemoryToken::UP _token; - uint64_t reduceMemoryConsumption(const MemoryToken& token, uint64_t reduceBy) override { + virtual uint64_t reduceMemoryConsumption(const MemoryToken& token, uint64_t reduceBy) override + { assert(&token == _token.get()); (void) &token; assert(_token->getSize() >= reduceBy); diff --git a/storageframework/src/tests/memory/memorystatetest.cpp b/storageframework/src/tests/memory/memorystatetest.cpp index 5a047a5c790..40d102199d6 100644 --- a/storageframework/src/tests/memory/memorystatetest.cpp +++ b/storageframework/src/tests/memory/memorystatetest.cpp @@ -2,6 +2,7 @@ #include <vespa/storageframework/defaultimplementation/clock/realclock.h> #include <vespa/storageframework/defaultimplementation/memory/memorystate.h> +#include <vespa/storageframework/generic/memory/memorymanagerinterface.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/vespalib/util/exceptions.h> @@ -11,6 +12,8 @@ namespace defaultimplementation { struct MemoryStateTest : public CppUnit::TestFixture { + void setUp() override {} + void tearDown() override {} void testBasics(); @@ -27,15 +30,15 @@ private: std::map<std::string, framework::MemoryAllocationType> _types; public: - void setMaximumMemoryUsage(uint64_t max) override { (void) max; } + virtual void setMaximumMemoryUsage(uint64_t max) override { (void) max; } - const framework::MemoryAllocationType& + virtual const framework::MemoryAllocationType& registerAllocationType(const framework::MemoryAllocationType& type) override { _types[type.getName()] = type; return _types[type.getName()]; } - const framework::MemoryAllocationType& + virtual const framework::MemoryAllocationType& getAllocationType(const std::string& name) const override { std::map<std::string, framework::MemoryAllocationType>::const_iterator iter = _types.find(name); @@ -47,7 +50,8 @@ public: return iter->second; } - std::vector<const MemoryAllocationType*> getAllocationTypes() const override { + virtual std::vector<const MemoryAllocationType*> getAllocationTypes() const override + { std::vector<const MemoryAllocationType*> types; for(std::map<std::string, framework::MemoryAllocationType> ::const_iterator it = _types.begin(); it != _types.end(); ++it) |