diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-09-12 22:16:01 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-09-14 06:58:17 +0000 |
commit | 755b6913407613821fb47fac95592930612add4b (patch) | |
tree | 702738d8426016c972acded228ce3d9288c7c151 /storageframework | |
parent | af61fbd1a0b8ea6867ea662111edd3fbe53205cb (diff) |
Reduce boost::noncopyable exposure.
Diffstat (limited to 'storageframework')
2 files changed, 6 insertions, 5 deletions
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h index 488f32ec5ca..8ce3769fd1c 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h @@ -21,7 +21,6 @@ #pragma once -#include <boost/utility.hpp> #include <map> #include <vespa/storageframework/generic/memory/memorymanagerinterface.h> #include <vespa/vespalib/util/printable.h> @@ -36,8 +35,7 @@ class AllocationLogic; class MemoryState; class MemoryTokenImpl : public vespalib::Printable, - public MemoryToken, - public boost::noncopyable + public MemoryToken { friend class AllocationLogic; @@ -51,6 +49,8 @@ class MemoryTokenImpl : public vespalib::Printable, public: typedef std::unique_ptr<MemoryTokenImpl> UP; + MemoryTokenImpl(const MemoryTokenImpl &) = delete; + MemoryTokenImpl & operator = (const MemoryTokenImpl &) = delete; MemoryTokenImpl(AllocationLogic& logic, const MemoryAllocationType& type, uint64_t allocated, diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.h b/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.h index 73a986ec877..0be8e41a05f 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/nomemorymanager.h @@ -11,7 +11,6 @@ #pragma once -#include <boost/utility.hpp> #include <map> #include <vespa/storageframework/generic/memory/memorymanagerinterface.h> #include <vespa/vespalib/util/printable.h> @@ -21,11 +20,13 @@ namespace storage { namespace framework { namespace defaultimplementation { -class SimpleMemoryTokenImpl : public MemoryToken, public boost::noncopyable +class SimpleMemoryTokenImpl : public MemoryToken { uint64_t _allocated; public: + SimpleMemoryTokenImpl(const SimpleMemoryTokenImpl &) = delete; + SimpleMemoryTokenImpl & operator = (const SimpleMemoryTokenImpl &) = delete; SimpleMemoryTokenImpl(uint64_t allocated) : _allocated(allocated) {} virtual uint64_t getSize() const { return _allocated; } |