remove boost::noncopyable

10 files changed, 41 insertions, 27 deletions

diff --git a/filedistribution/src/apps/filedistributor/filedistributor.cpp b/filedistribution/src/apps/filedistributor/filedistributor.cpp
index 5e006ec4745..62def74ee7a 100644
--- a/filedistribution/src/apps/filedistributor/filedistributor.cpp
+++ b/filedistribution/src/apps/filedistributor/filedistributor.cpp
@@ -9,7 +9,6 @@
 #include <boost/lambda/lambda.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/scope_exit.hpp>
@@ -49,10 +48,9 @@ using cloud::config::filedistribution::FiledistributorrpcConfig;
 class FileDistributor : public config::IFetcherCallback<ZookeepersConfig>,
                         public config::IFetcherCallback<FiledistributorConfig>,
                         public config::IFetcherCallback<FiledistributorrpcConfig>,
-                        public config::IGenerationCallback,
-                        boost::noncopyable
+                        public config::IGenerationCallback
 {
-    class Components : boost::noncopyable {
+    class Components {
         ComponentsDeleter _componentsDeleter;
     public:
         const boost::shared_ptr<ZKFacade> _zk;
@@ -74,6 +72,8 @@ class FileDistributor : public config::IFetcherCallback<ZookeepersConfig>,
         }
 
     public:
+        Components(const Components &) = delete;
+        Components & operator = (const Components &) = delete;
 
         Components(const boost::shared_ptr<ExceptionRethrower>& exceptionRethrower,
                    const config::ConfigUri & configUri,
@@ -137,6 +137,8 @@ class FileDistributor : public config::IFetcherCallback<ZookeepersConfig>,
     boost::shared_ptr<ExceptionRethrower> _exceptionRethrower;
     std::unique_ptr<Components> _components;
 public:
+    FileDistributor(const FileDistributor &) = delete;
+    FileDistributor & operator = (const FileDistributor &) = delete;
     FileDistributor()
         : _configMutex(),
           _completeReconfigurationNeeded(false),
diff --git a/filedistribution/src/vespa/filedistribution/common/buffer.h b/filedistribution/src/vespa/filedistribution/common/buffer.h
index 0c0692798ac..2325b3e11ee 100644
--- a/filedistribution/src/vespa/filedistribution/common/buffer.h
+++ b/filedistribution/src/vespa/filedistribution/common/buffer.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 <algorithm>
 
 namespace filedistribution {
@@ -37,7 +36,7 @@ inline Move<T> move(T& t) {
     return Move<T>(t);
 }
 
-class Buffer : boost::noncopyable {
+class Buffer {
     size_t _capacity;
     char* _buf;
     size_t _size;
@@ -47,6 +46,8 @@ public:
     typedef char* iterator;
     typedef const char* const_iterator;
 
+    Buffer(const Buffer &) = delete;
+    Buffer & operator = (const Buffer &) = delete;
     explicit Buffer(size_t capacityArg)
         :_capacity(capacityArg),
          _buf( new char[_capacity] ),
diff --git a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h
index afb122b3a2f..4238f88a05e 100644
--- a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h
+++ b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h
@@ -9,7 +9,6 @@
 #include <boost/bind.hpp>
 #include <boost/checked_delete.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/thread.hpp>
 
 #include "concurrentqueue.h"
@@ -21,7 +20,7 @@ namespace filedistribution {
  *
  * This prevents situations as e.g. deleting ZKFacade from a zookeeper watcher thread.
  */
-class ComponentsDeleter : boost::noncopyable {
+class ComponentsDeleter {
     class Worker;
     typedef boost::lock_guard<boost::mutex> LockGuard;
 
@@ -51,6 +50,8 @@ class ComponentsDeleter : boost::noncopyable {
     bool allComponentsDeleted();
     void logNotDeletedComponents();
   public:
+    ComponentsDeleter(const ComponentsDeleter &) = delete;
+    ComponentsDeleter & operator = (const ComponentsDeleter &) = delete;
     ComponentsDeleter();
 
     /*
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.h b/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.h
index edebe5a8423..f99888c5a26 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.h
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.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 <boost/thread/mutex.hpp>
 #include <boost/signals2/signal.hpp>
 #include <boost/enable_shared_from_this.hpp>
@@ -13,7 +12,6 @@
 namespace filedistribution {
 
 class FileDownloaderManager : public FileProvider,
-                              boost::noncopyable,
                               public boost::enable_shared_from_this<FileDownloaderManager> {
 
     class StartDownloads {
@@ -45,6 +43,8 @@ class FileDownloaderManager : public FileProvider,
 
     void removePeerStatus(const std::string& fileReference);
 public:
+    FileDownloaderManager(const FileDownloaderManager &) = delete;
+    FileDownloaderManager & operator = (const FileDownloaderManager &) = delete;
     FileDownloaderManager(const boost::shared_ptr<FileDownloader>&,
             const boost::shared_ptr<FileDistributionModel>& model);
     ~FileDownloaderManager();
diff --git a/filedistribution/src/vespa/filedistribution/distributor/scheduler.h b/filedistribution/src/vespa/filedistribution/distributor/scheduler.h
index 75d4fa2d57b..9492a8977d7 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/scheduler.h
+++ b/filedistribution/src/vespa/filedistribution/distributor/scheduler.h
@@ -9,7 +9,7 @@
 
 namespace filedistribution {
 
-class Scheduler : boost::noncopyable {
+class Scheduler {
 public:
     class Task : public boost::enable_shared_from_this<Task> {
         boost::asio::deadline_timer _timer;
@@ -37,6 +37,8 @@ private:
     boost::thread _workerThread;
 
 public:
+    Scheduler(const Scheduler &) = delete;
+    Scheduler & operator = (const Scheduler &) = delete;
     Scheduler(boost::function<void (boost::asio::io_service&)> callRun) ;
     ~Scheduler();
 };
diff --git a/filedistribution/src/vespa/filedistribution/model/filedbmodel.h b/filedistribution/src/vespa/filedistribution/model/filedbmodel.h
index ea564668e45..d7803b8afea 100644
--- a/filedistribution/src/vespa/filedistribution/model/filedbmodel.h
+++ b/filedistribution/src/vespa/filedistribution/model/filedbmodel.h
@@ -25,7 +25,7 @@ struct InvalidProgressException : public Exception {
 
 struct FileDoesNotExistException : public Exception {};
 
-class FileDBModel : boost::noncopyable {
+class FileDBModel {
 public:
     class InvalidHostStatusException : public Exception {};
     struct HostStatus {
@@ -36,6 +36,9 @@ public:
         size_t _numFilesFinished;
     };
 
+    FileDBModel(const FileDBModel &) = delete;
+    FileDBModel & operator = (const FileDBModel &) = delete;
+    FileDBModel() = default;
     virtual ~FileDBModel();
 
     virtual bool hasFile(const std::string& fileReference) = 0;
diff --git a/filedistribution/src/vespa/filedistribution/model/filedistributionmodel.h b/filedistribution/src/vespa/filedistribution/model/filedistributionmodel.h
index 516e183490e..170c5311bf2 100644
--- a/filedistribution/src/vespa/filedistribution/model/filedistributionmodel.h
+++ b/filedistribution/src/vespa/filedistribution/model/filedistributionmodel.h
@@ -6,7 +6,6 @@
 #include <string>
 #include <set>
 
-#include <boost/noncopyable.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/signals2.hpp>
 
@@ -17,7 +16,7 @@
 
 namespace filedistribution {
 
-class FileDistributionModel : boost::noncopyable {
+class FileDistributionModel {
 public:
     class NotPeer : public Exception {};
 
@@ -33,6 +32,9 @@ public:
     virtual void removePeer(const std::string& fileReference) = 0;
     virtual void peerFinished(const std::string& fileReference) = 0; //throws NotPeer
 
+    FileDistributionModel(const FileDistributionModel &) = delete;
+    FileDistributionModel & operator = (const FileDistributionModel &) = delete;
+    FileDistributionModel() = default;
     virtual ~FileDistributionModel() {}
 
     FilesToDownloadChangedSignal _filesToDownloadChanged;
diff --git a/filedistribution/src/vespa/filedistribution/model/zkfacade.h b/filedistribution/src/vespa/filedistribution/model/zkfacade.h
index 505ff008079..e46ed42fdec 100644
--- a/filedistribution/src/vespa/filedistribution/model/zkfacade.h
+++ b/filedistribution/src/vespa/filedistribution/model/zkfacade.h
@@ -3,7 +3,6 @@
 
 #include <string>
 #include <vector>
-#include <boost/noncopyable.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
@@ -60,7 +59,7 @@ diagnosticUserLevelMessage(const ZKException& zk);
 
 
 
-class ZKFacade : boost::noncopyable, public boost::enable_shared_from_this<ZKFacade> {
+class ZKFacade : public boost::enable_shared_from_this<ZKFacade> {
     volatile bool _retriesEnabled;
     volatile bool _watchersEnabled;
 
@@ -78,15 +77,20 @@ public:
        Derived classes should only contain weak_ptrs to other objects
        to avoid linking their lifetime to the ZKFacade lifetime.
      */
-    class NodeChangedWatcher : boost::noncopyable {
+    class NodeChangedWatcher {
       public:
-        virtual void operator()() = 0;
+        NodeChangedWatcher(const NodeChangedWatcher &) = delete;
+        NodeChangedWatcher & operator = (const NodeChangedWatcher &) = delete;
+        NodeChangedWatcher() = default;
         virtual ~NodeChangedWatcher() {};
+        virtual void operator()() = 0;
     };
 
     typedef boost::shared_ptr<NodeChangedWatcher> NodeChangedWatcherSP;
     typedef boost::filesystem::path Path;
 
+    ZKFacade(const ZKFacade &) = delete;
+    ZKFacade & operator = (const ZKFacade &) = delete;
     ZKFacade(const std::string& zkservers, const boost::shared_ptr<ExceptionRethrower> &);
     ~ZKFacade();
 
diff --git a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp
index 5d6478c8259..4e63b90d8b9 100644
--- a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp
+++ b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp
@@ -2,7 +2,6 @@
 #include <vespa/fastos/fastos.h>
 #include "filedistributorrpc.h"
 
-#include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/locks.hpp>
@@ -145,7 +144,7 @@ public:
 
 } //anonymous namespace
 
-class FileDistributorRPC::Server : public FRT_Invokable, boost::noncopyable {
+class FileDistributorRPC::Server : public FRT_Invokable {
   public:
     boost::shared_ptr<FileProvider> _fileProvider;
     std::unique_ptr<FRT_Supervisor> _supervisor;
@@ -158,8 +157,9 @@ class FileDistributorRPC::Server : public FRT_Invokable, boost::noncopyable {
     void queueRequest(const std::string& fileReference, FRT_RPCRequest* request);
     void defineMethods();
 
-    Server(int listen_port,
-           const boost::shared_ptr<FileProvider>& provider);
+    Server(const Server &) = delete;
+    Server & operator = (const Server &) = delete;
+    Server(int listen_port, const boost::shared_ptr<FileProvider>& provider);
     void start(const boost::shared_ptr<FileDistributorRPC> parent);
     ~Server();
 
diff --git a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.h b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.h
index e527fc2aeca..8c492ad4b5d 100644
--- a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.h
+++ b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.h
@@ -3,19 +3,18 @@
 
 #include <memory>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/noncopyable.hpp>
 
 #include "fileprovider.h"
 
 namespace filedistribution {
 
-class FileDistributorRPC : boost::noncopyable,
-                           public boost::enable_shared_from_this<FileDistributorRPC>
+class FileDistributorRPC : public boost::enable_shared_from_this<FileDistributorRPC>
 {
     class Server;
 public:
-    FileDistributorRPC(const std::string& connectSpec,
-                       const boost::shared_ptr<FileProvider>& provider);
+    FileDistributorRPC(const FileDistributorRPC &) = delete;
+    FileDistributorRPC & operator = (const FileDistributorRPC &) = delete;
+    FileDistributorRPC(const std::string& connectSpec, const boost::shared_ptr<FileProvider>& provider);
 
     void start();