Reduce boost::noncopyable exposure.

3 files changed, 11 insertions, 9 deletions

diff --git a/searchcorespi/src/vespa/searchcorespi/index/i_thread_service.h b/searchcorespi/src/vespa/searchcorespi/index/i_thread_service.h
index ffa160f7c96..1d6fba517d2 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/i_thread_service.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/i_thread_service.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/vespalib/util/runnable.h>
 #include <vespa/vespalib/util/threadexecutor.h>
 
@@ -11,9 +10,11 @@ namespace index {
 /**
  * Interface for a single thread used for write tasks.
  */
-struct IThreadService : public boost::noncopyable,
-                        public vespalib::ThreadExecutor
+struct IThreadService : public vespalib::ThreadExecutor
 {
+    IThreadService(const IThreadService &) = delete;
+    IThreadService & operator = (const IThreadService &) = delete;
+    IThreadService() = default;
     virtual ~IThreadService() {}
 
     /**
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
index 537dc39f3ce..417f79fa6ca 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
@@ -11,7 +11,6 @@
 #include "imemoryindex.h"
 #include "warmupindexcollection.h"
 #include "ithreadingservice.h"
-#include <boost/noncopyable.hpp>
 #include <vespa/searchcorespi/index/iindexmanager.h>
 #include <vespa/searchcorespi/index/indexsearchable.h>
 #include <vespa/searchcorespi/index/indexcollection.h>
@@ -42,8 +41,7 @@ namespace index {
  * across all indexes, and manages the set of indexes through flushing
  * of memory indexes and fusion of disk indexes.
  */
-class IndexMaintainer : public boost::noncopyable,
-                        public IIndexManager,
+class IndexMaintainer : public IIndexManager,
                         public IWarmupDone
 {
     /**
@@ -313,6 +311,8 @@ class IndexMaintainer : public boost::noncopyable,
     void commit();
 
 public:
+    IndexMaintainer(const IndexMaintainer &) = delete;
+    IndexMaintainer & operator = (const IndexMaintainer &) = delete;
     IndexMaintainer(const IndexMaintainerConfig &config,
                     const IndexMaintainerContext &context,
                     IIndexMaintainerOperations &operations);
diff --git a/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h b/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h
index ec68b374487..2cc93dc229b 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "i_thread_service.h"
-#include <boost/noncopyable.hpp>
 #include <vespa/vespalib/util/runnable.h>
 #include <vespa/vespalib/util/executor.h>
 #include <vespa/vespalib/util/syncable.h>
@@ -48,9 +47,11 @@ namespace index {
  * to sync index field inverter executor before syncing index field
  * writer executor.
  */
-struct IThreadingService : public boost::noncopyable,
-                           public vespalib::Syncable
+struct IThreadingService : public vespalib::Syncable
 {
+    IThreadingService(const IThreadingService &) = delete;
+    IThreadingService & operator = (const IThreadingService &) = delete;
+    IThreadingService() = default;
     virtual ~IThreadingService() {}
 
     /**