summaryrefslogtreecommitdiffstats
path: root/storageframework
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-05-08 21:11:12 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2017-05-09 07:16:19 +0000
commit7bf0a4cf3933b16ee748d94b2d497036872254e6 (patch)
tree040a8a084166d5f1aba573f191f98d6dbae8519d /storageframework
parent3d7a132548f11ae2f6bd01ecf362674e924f9643 (diff)
Deinline as compiler makes the best choices.
Diffstat (limited to 'storageframework')
-rw-r--r--storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.cpp11
-rw-r--r--storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.h2
2 files changed, 7 insertions, 6 deletions
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.cpp
index 36f85d25ff1..3480c5db4bf 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.cpp
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.cpp
@@ -3,9 +3,9 @@
#include "nomemorymanager.h"
#include <vespa/vespalib/util/exceptions.h>
-namespace storage {
-namespace framework {
-namespace defaultimplementation {
+namespace storage::framework::defaultimplementation {
+
+NoMemoryManager::~NoMemoryManager() {}
const MemoryAllocationType&
NoMemoryManager::registerAllocationType(const MemoryAllocationType& type)
@@ -42,6 +42,5 @@ NoMemoryManager::getAllocationTypes() const
return types;
}
-} // defaultimplementation
-} // framework
-} // storage
+}
+
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.h b/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.h
index 43669eac603..452dd3a2444 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.h
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.h
@@ -41,6 +41,8 @@ class NoMemoryManager : public MemoryManagerInterface
public:
typedef std::unique_ptr<NoMemoryManager> UP;
+ ~NoMemoryManager();
+
void setMaximumMemoryUsage(uint64_t) override {}
const MemoryAllocationType & registerAllocationType(const MemoryAllocationType& type) override;
const MemoryAllocationType & getAllocationType(const std::string& name) const override;