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/memorystatetest.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/memorystatetest.cpp')
-rw-r--r-- | storageframework/src/tests/memory/memorystatetest.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/storageframework/src/tests/memory/memorystatetest.cpp b/storageframework/src/tests/memory/memorystatetest.cpp index 40d102199d6..5a047a5c790 100644 --- a/storageframework/src/tests/memory/memorystatetest.cpp +++ b/storageframework/src/tests/memory/memorystatetest.cpp @@ -2,7 +2,6 @@ #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> @@ -12,8 +11,6 @@ namespace defaultimplementation { struct MemoryStateTest : public CppUnit::TestFixture { - void setUp() override {} - void tearDown() override {} void testBasics(); @@ -30,15 +27,15 @@ private: std::map<std::string, framework::MemoryAllocationType> _types; public: - virtual void setMaximumMemoryUsage(uint64_t max) override { (void) max; } + void setMaximumMemoryUsage(uint64_t max) override { (void) max; } - virtual const framework::MemoryAllocationType& + const framework::MemoryAllocationType& registerAllocationType(const framework::MemoryAllocationType& type) override { _types[type.getName()] = type; return _types[type.getName()]; } - virtual const framework::MemoryAllocationType& + const framework::MemoryAllocationType& getAllocationType(const std::string& name) const override { std::map<std::string, framework::MemoryAllocationType>::const_iterator iter = _types.find(name); @@ -50,8 +47,7 @@ public: return iter->second; } - virtual std::vector<const MemoryAllocationType*> getAllocationTypes() const override - { + 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) |