Reduce boost::noncopyable exposure.

4 files changed, 12 insertions, 8 deletions

diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/buffer.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/buffer.h
index 2484209d23e..d097a078af9 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/mapper/buffer.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/buffer.h
@@ -11,14 +11,13 @@
 
 #pragma once
 
-#include <boost/utility.hpp>
 #include <vespa/vespalib/util/alloc.h>
 #include <vespa/vespalib/util/linkedptr.h>
 
 namespace storage {
 namespace memfile {
 
-class Buffer : boost::noncopyable // Ensure no accidental copying of a buffer
+class Buffer
 {
     // Use AutoAlloc to transparently use mmap for large buffers.
     // It is crucial that any backing buffer type returns an address that is
@@ -33,6 +32,8 @@ class Buffer : boost::noncopyable // Ensure no accidental copying of a buffer
 public:
     typedef vespalib::LinkedPtr<Buffer> LP;
 
+    Buffer(const Buffer &) = delete;
+    Buffer & operator = (const Buffer &) = delete;
     Buffer(size_t size);
 
     /**
diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.h
index e1101d94b58..67cdd2208a0 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include <boost/utility.hpp>
 #include <vespa/fastos/types.h>
 #include <vector>
 
@@ -28,7 +27,7 @@ namespace storage {
 
 namespace memfile {
 
-class BufferedFileWriter : public boost::noncopyable {
+class BufferedFileWriter {
 public:
     struct Cache {
         virtual ~Cache() {}
@@ -55,6 +54,8 @@ private:
     bool _writing;
 
 public:
+    BufferedFileWriter(const BufferedFileWriter &) = delete;
+    BufferedFileWriter & operator = (const BufferedFileWriter &) = delete;
     /**
      * Create a new buffered file writer.
      *
diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.h b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.h
index cc25bd5f7a8..e4417fb6e0f 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.h
@@ -51,7 +51,7 @@ public:
         {}
     };
 private:
-    class Entry : boost::noncopyable {
+    class Entry {
     public:
         typedef vespalib::LinkedPtr<Entry> LP;
 
@@ -61,6 +61,8 @@ private:
         bool _inUse;
         bool _returnToCacheWhenFinished;
 
+        Entry(const Entry &) = delete;
+        Entry & operator = (const Entry &) = delete;
         Entry(FileSpecification& file, Environment& env,
               bool returnToCacheWhenFinished = true)
             : _file(file, env), _env(env), _inUse(true),
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.h b/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.h
index 9a2700c4209..fad723de4aa 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.h
@@ -10,7 +10,6 @@
  */
 #pragma once
 
-#include <boost/utility.hpp>
 #include <vespa/memfilepersistence/common/exceptions.h>
 #include <vespa/memfilepersistence/common/filespecification.h>
 #include <vespa/memfilepersistence/common/types.h>
@@ -25,8 +24,7 @@
 namespace storage {
 namespace memfile {
 
-class OperationHandler : protected Types,
-                         private boost::noncopyable
+class OperationHandler : protected Types
 {
 protected:
     Environment& _env;
@@ -34,6 +32,8 @@ protected:
 public:
     typedef std::unique_ptr<OperationHandler> UP;
 
+    OperationHandler(const OperationHandler &) = delete;
+    OperationHandler & operator = (const OperationHandler &) = delete;
     OperationHandler(Environment&);
     virtual ~OperationHandler() {}