Reduce boost::noncopyable exposure.

8 files changed, 18 insertions, 20 deletions

diff --git a/storage/src/vespa/storage/bucketmover/run.h b/storage/src/vespa/storage/bucketmover/run.h
index 31f11d74e44..575a9c60183 100644
--- a/storage/src/vespa/storage/bucketmover/run.h
+++ b/storage/src/vespa/storage/bucketmover/run.h
@@ -15,7 +15,6 @@
 
 #pragma once
 
-#include <boost/utility.hpp>
 #include <list>
 #include <map>
 #include <vespa/storage/bucketmover/move.h>
@@ -33,7 +32,7 @@ class Clock;
 
 namespace bucketmover {
 
-class Run : public document::Printable, boost::noncopyable {
+class Run : public document::Printable {
     StorBucketDatabase& _bucketDatabase;
     lib::Distribution::SP _distribution;
     lib::NodeState _nodeState;
@@ -47,6 +46,8 @@ class Run : public document::Printable, boost::noncopyable {
     std::map<uint16_t, bool> _diskDisabled;
 
 public:
+    Run(const Run &) = delete;
+    Run & operator = (const Run &) = delete;
     Run(StorBucketDatabase&,
         lib::Distribution::SP,
         const lib::NodeState&,
diff --git a/storage/src/vespa/storage/common/storagelink.h b/storage/src/vespa/storage/common/storagelink.h
index a7b68c59ee5..5a683d55b03 100644
--- a/storage/src/vespa/storage/common/storagelink.h
+++ b/storage/src/vespa/storage/common/storagelink.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <boost/utility.hpp>
 #include <vespa/vespalib/util/printable.h>
 #include <vespa/fastos/fastos.h>
 #include <memory>
@@ -35,7 +34,6 @@ class FileStorManagerTest;
 
 class StorageLink : public document::Printable,
                     public ChainedMessageSender,
-                    private boost::noncopyable,
                     protected api::MessageHandler
 {
 public:
@@ -44,15 +42,14 @@ public:
     enum State { CREATED, OPENED, CLOSING, FLUSHINGDOWN, FLUSHINGUP, CLOSED };
 
 private:
-    StorageLink(const StorageLink&);
-    StorageLink& operator=(const StorageLink&);
-
     std::string _name;
     StorageLink* _up;
     std::unique_ptr<StorageLink> _down;
     State _state;
 
 public:
+    StorageLink(const StorageLink &) = delete;
+    StorageLink & operator = (const StorageLink &) = delete;
     StorageLink(const std::string& name)
         : _name(name), _up(0), _down(), _state(CREATED) {}
     virtual ~StorageLink();
diff --git a/storage/src/vespa/storage/distributor/statechecker.cpp b/storage/src/vespa/storage/distributor/statechecker.cpp
index b9f8058cf13..972397922c2 100644
--- a/storage/src/vespa/storage/distributor/statechecker.cpp
+++ b/storage/src/vespa/storage/distributor/statechecker.cpp
@@ -15,12 +15,13 @@ namespace distributor {
 namespace {
 
 class StoredResultImpl
-    : public StateChecker::ResultImpl,
-      boost::noncopyable
+    : public StateChecker::ResultImpl
 {
     mutable IdealStateOperation::UP _operation;
     MaintenancePriority _priority;
 public:
+    StoredResultImpl(const StoredResultImpl &) = delete;
+    StoredResultImpl & operator = (const StoredResultImpl &) = delete;
     StoredResultImpl()
         : _operation(),
           _priority(MaintenancePriority::NO_MAINTENANCE_NEEDED)
diff --git a/storage/src/vespa/storage/distributor/statechecker.h b/storage/src/vespa/storage/distributor/statechecker.h
index 2ae43a4338c..3b0d16644df 100644
--- a/storage/src/vespa/storage/distributor/statechecker.h
+++ b/storage/src/vespa/storage/distributor/statechecker.h
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <boost/noncopyable.hpp>
 #include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/common/storagecomponent.h>
 #include <vespa/storage/distributor/operations/idealstate/idealstateoperation.h>
diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h
index 009adb0c2d0..2f3f5ea9d57 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h
+++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h
@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include <boost/noncopyable.hpp>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/fastlib/net/httpserver.h>
 #include <list>
@@ -21,8 +20,7 @@
 
 namespace storage {
 
-class StatusWebServer : private boost::noncopyable,
-                        private config::IFetcherCallback<vespa::config::content::core::StorStatusConfig>,
+class StatusWebServer : private config::IFetcherCallback<vespa::config::content::core::StorStatusConfig>,
                         private framework::Runnable
 {
     class WebServer : public Fast_HTTPServer {
@@ -63,6 +61,8 @@ class StatusWebServer : private boost::noncopyable,
     framework::Thread::UP _thread;
 
 public:
+    StatusWebServer(const StatusWebServer &) = delete;
+    StatusWebServer & operator = (const StatusWebServer &) = delete;
     StatusWebServer(framework::ComponentRegister&,
                     framework::StatusReporterMap&,
                     const config::ConfigUri & configUri);
diff --git a/storage/src/vespa/storage/persistence/diskthread.h b/storage/src/vespa/storage/persistence/diskthread.h
index 5f0f367f010..3626bbb2c70 100644
--- a/storage/src/vespa/storage/persistence/diskthread.h
+++ b/storage/src/vespa/storage/persistence/diskthread.h
@@ -12,7 +12,6 @@
  */
 #pragma once
 
-#include <boost/utility.hpp>
 #include <vespa/vespalib/util/printable.h>
 #include <vespa/vespalib/util/document_runnable.h>
 #include <vespa/storageframework/storageframework.h>
@@ -27,12 +26,14 @@ class Directory;
 class SlotFileOptions;
 struct FileStorThreadMetrics;
 
-class DiskThread : public framework::Runnable,
-                   private boost::noncopyable
+class DiskThread : public framework::Runnable
 {
 public:
     typedef std::shared_ptr<DiskThread> SP;
 
+    DiskThread(const DiskThread &) = delete;
+    DiskThread & operator = (const DiskThread &) = delete;
+    DiskThread() = default;
     virtual ~DiskThread() {}
 
     /**
diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h
index f7448fc25b8..7849d06b971 100644
--- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h
+++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h
@@ -10,7 +10,6 @@
 #include <vespa/storage/persistence/types.h>
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/vespalib/util/sync.h>
-#include <boost/noncopyable.hpp>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/storageserver/storagenode.h b/storage/src/vespa/storage/storageserver/storagenode.h
index a63bd1ce4e9..8afe3397179 100644
--- a/storage/src/vespa/storage/storageserver/storagenode.h
+++ b/storage/src/vespa/storage/storageserver/storagenode.h
@@ -14,7 +14,6 @@
 
 #pragma once
 
-#include <boost/utility.hpp>
 #include <vespa/document/bucket/bucketidfactory.h>
 #include <vespa/fastos/fastos.h>
 #include <memory>
@@ -57,8 +56,7 @@ class FileStorManager;
 class HostInfo;
 class StateManager;
 
-class StorageNode : private boost::noncopyable,
-                    private config::IFetcherCallback<vespa::config::content::core::StorServerConfig>,
+class StorageNode : private config::IFetcherCallback<vespa::config::content::core::StorServerConfig>,
                     private config::IFetcherCallback<vespa::config::content::StorDistributionConfig>,
                     private config::IFetcherCallback<vespa::config::content::UpgradingConfig>,
                     private config::IFetcherCallback<vespa::config::content::core::StorPrioritymappingConfig>,
@@ -69,6 +67,8 @@ class StorageNode : private boost::noncopyable,
 public:
     enum RunMode { NORMAL, SINGLE_THREADED_TEST_MODE };
 
+    StorageNode(const StorageNode &) = delete;
+    StorageNode & operator = (const StorageNode &) = delete;
     /**
      * @param excludeStorageChain With this option set, no chain will be set
      * up. This can be useful in unit testing if you need a storage server