Remove all usage of boost::noncopyable.

12 files changed, 23 insertions, 26 deletions

diff --git a/documentapi/src/vespa/documentapi/messagebus/iroutablefactory.h b/documentapi/src/vespa/documentapi/messagebus/iroutablefactory.h
index 0ca3bc10531..5f6e39c2a6d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/iroutablefactory.h
+++ b/documentapi/src/vespa/documentapi/messagebus/iroutablefactory.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/shared_ptr.hpp>
 #include <vespa/document/util/bytebuffer.h>
 #include <vespa/messagebus/routable.h>
 #include <vespa/vespalib/component/version.h>
@@ -22,7 +21,9 @@ class LoadTypeSet;
  * factory across multiple routable types. To share serialization logic between factory use a common
  * superclass or composition with a common serialization utility.
  */
-class IRoutableFactory : public boost::noncopyable {
+class IRoutableFactory {
+protected:
+    IRoutableFactory() = default;
 public:
     /**
      * Convenience typedefs.
@@ -30,6 +31,8 @@ public:
     typedef std::unique_ptr<IRoutableFactory> UP;
     typedef std::shared_ptr<IRoutableFactory> SP;
 
+    IRoutableFactory(const IRoutableFactory &) = delete;
+    IRoutableFactory & operator = (const IRoutableFactory &) = delete;
     /**
      * Virtual destructor required for inheritance.
      */
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h
index 2790adcc774..75c697331d3 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.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/utility.hpp>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
 
 namespace documentapi {
@@ -11,7 +10,7 @@ namespace documentapi {
  * #select(RoutingContext)} is invoked. This is useful for returning error states to the client instead of
  * those auto-generated by mbus when a routing policy can not be created.
  */
-class ErrorPolicy : public boost::noncopyable, public mbus::IRoutingPolicy {
+class ErrorPolicy : public mbus::IRoutingPolicy {
 private:
     string _msg;
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h
index 83b9a64b79e..f4a9157f8e3 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.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/utility.hpp>
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/messagebus/routing/hop.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
@@ -16,7 +15,7 @@ namespace documentapi {
  * This policy implements the necessary logic to communicate with an external Vespa application and resolve its list of
  * recipients using that other application's slobrok servers.
  */
-class ExternPolicy : public boost::noncopyable, public mbus::IRoutingPolicy {
+class ExternPolicy : public mbus::IRoutingPolicy {
 private:
     vespalib::Lock                         _lock;
     FRT_Supervisor                         _orb;
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h
index 8d0eca83ac9..b782abbef27 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h
@@ -1,14 +1,12 @@
 // 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/documentapi/messagebus/policies/loadbalancer.h>
 #include <vespa/documentapi/messagebus/policies/externslobrokpolicy.h>
 
 namespace documentapi {
 
-class LoadBalancerPolicy : public boost::noncopyable,
-                           public ExternSlobrokPolicy
+class LoadBalancerPolicy : public ExternSlobrokPolicy
 {
 public:
     LoadBalancerPolicy(const string& param);
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h
index 85c26794b97..ccdc67c9291 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.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/utility.hpp>
 #include <vespa/messagebus/routing/hop.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
 #include <string>
@@ -16,7 +15,7 @@ namespace documentapi {
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
  * @version $Id$
  */
-class LocalServicePolicy : public boost::noncopyable, public mbus::IRoutingPolicy {
+class LocalServicePolicy : public mbus::IRoutingPolicy {
 private:
     struct CacheEntry {
         uint32_t               _offset;
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h
index e65763a114d..7bd839f762c 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.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/utility.hpp>
 #include <vespa/messagebus/routing/hop.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
 #include <string>
@@ -16,7 +15,7 @@ namespace documentapi {
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
  * @version $Id$
  */
-class RoundRobinPolicy : public boost::noncopyable, public mbus::IRoutingPolicy {
+class RoundRobinPolicy : public mbus::IRoutingPolicy {
 private:
     struct CacheEntry {
         uint32_t               _offset;
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.h
index a7420acf8ef..2b7e03dc014 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.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/utility.hpp>
 #include <vespa/document/bucket/bucketidfactory.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
 #include <vespa/vdslib/bucketdistribution.h>
@@ -15,7 +14,7 @@ namespace documentapi {
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
  * @version $Id$
  */
-class SearchColumnPolicy : public boost::noncopyable, public mbus::IRoutingPolicy {
+class SearchColumnPolicy : public mbus::IRoutingPolicy {
 private:
     typedef std::map<uint32_t, vdslib::BucketDistribution> DistributionCache;
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h
index 096dec568ec..1f80b36c109 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h
@@ -10,8 +10,7 @@
 
 namespace documentapi {
 
-class StoragePolicy : public boost::noncopyable,
-                      public ExternSlobrokPolicy,
+class StoragePolicy : public ExternSlobrokPolicy,
                       public config::IFetcherCallback<vespa::config::content::StorDistributionConfig>
 {
 private:
@@ -41,8 +40,7 @@ public:
      * @return a pointer to the system state registered with this policy. If
      * we haven't received a system state yet, returns NULL.
      */
-    const storage::lib::ClusterState* getSystemState() const
-        { return _state.get(); }
+    const storage::lib::ClusterState* getSystemState() const { return _state.get(); }
 
     void configure(std::unique_ptr<vespa::config::content::StorDistributionConfig> config);
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h
index 367aae183ff..5103904df65 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.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/utility.hpp>
 #include <vespa/messagebus/routing/hop.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
 #include <string>
@@ -15,7 +14,7 @@ namespace documentapi {
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
  * @version $Id$
  */
-class SubsetServicePolicy : public boost::noncopyable, public mbus::IRoutingPolicy {
+class SubsetServicePolicy : public mbus::IRoutingPolicy {
 private:
     struct CacheEntry {
         uint32_t               _offset;
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablerepository.h b/documentapi/src/vespa/documentapi/messagebus/routablerepository.h
index e39eab89507..977a8b5268a 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablerepository.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routablerepository.h
@@ -17,7 +17,7 @@ class LoadTypeSet;
  * factory cache to reduce the latency of matching version specifications to actual versions when resolving
  * factories.
  */
-class RoutableRepository : public boost::noncopyable {
+class RoutableRepository {
 private:
     /**
      * Internal helper class that implements a map from {@link VersionSpecification} to {@link
@@ -43,6 +43,8 @@ private:
     const LoadTypeSet&   _loadTypes;
 
 public:
+    RoutableRepository(const RoutableRepository &) = delete;
+    RoutableRepository & operator = (const RoutableRepository &) = delete;
     /**
      * Constructs a new routable repository.
      */
diff --git a/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h b/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h
index cd19d5f0676..c0dab2d710b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.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/utility.hpp>
 #include <map>
 #include <string>
 #include <vespa/vespalib/util/sync.h>
@@ -9,7 +8,7 @@
 
 namespace documentapi {
 
-class RoutingPolicyRepository : public boost::noncopyable {
+class RoutingPolicyRepository {
 private:
     typedef std::map<string, IRoutingPolicyFactory::SP> FactoryMap;
 
@@ -17,6 +16,8 @@ private:
     FactoryMap           _factories;
 
 public:
+    RoutingPolicyRepository(const RoutingPolicyRepository &) = delete;
+    RoutingPolicyRepository & operator = (const RoutingPolicyRepository &) = delete;
     /**
      * Constructs a new routing policy repository.
      */
diff --git a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.h b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.h
index 544a1b6716e..8254dc29c30 100644
--- a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.h
+++ b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.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/utility.hpp>
 #include <string>
 #include <vespa/vespalib/util/sync.h>
 #include "nodestate.h"
@@ -13,7 +12,7 @@ namespace documentapi {
  * string. The naming of this class is intended to capture the fact that this annotated service tree actually
  * contains the state of each service in the system.
  */
-class SystemState : public boost::noncopyable {
+class SystemState {
 private:
     static vespalib::Lock _parseLock;
 
@@ -31,6 +30,8 @@ private:
     SystemState(NodeState::UP root);
 
 public:
+    SystemState(const SystemState &) = delete;
+    SystemState & operator = (const SystemState &) = delete;
     /**
      * Convenience typedefs.
      */