summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-09-14 13:33:31 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2016-09-14 13:33:31 +0000
commit220cc759df24d938fcc125818365834ff7e9370f (patch)
treeff3e2e77561937556a59dcc20dfb90bf79aa01ad /searchlib
parent060953cb4a5b15cf1465094424f39f3829512671 (diff)
Remove all usage of boost::noncopyable.
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/attribute/iattributemanager.h4
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/nearsearch.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/iattributemanager.h b/searchlib/src/vespa/searchlib/attribute/iattributemanager.h
index 7e3ab9c164c..0b50bf39203 100644
--- a/searchlib/src/vespa/searchlib/attribute/iattributemanager.h
+++ b/searchlib/src/vespa/searchlib/attribute/iattributemanager.h
@@ -13,6 +13,8 @@ namespace search {
**/
class IAttributeManager {
public:
+ IAttributeManager(const IAttributeManager &) = delete;
+ IAttributeManager & operator = (const IAttributeManager &) = delete;
typedef std::shared_ptr<IAttributeManager> SP;
typedef vespalib::string string;
@@ -51,6 +53,8 @@ public:
* Virtual destructor to allow safe subclassing.
**/
virtual ~IAttributeManager() {}
+protected:
+ IAttributeManager() = default;
};
} // namespace search
diff --git a/searchlib/src/vespa/searchlib/queryeval/nearsearch.h b/searchlib/src/vespa/searchlib/queryeval/nearsearch.h
index 48a3af91a4d..2cf737d41b0 100644
--- a/searchlib/src/vespa/searchlib/queryeval/nearsearch.h
+++ b/searchlib/src/vespa/searchlib/queryeval/nearsearch.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/searchlib/fef/termfieldmatchdata.h>
#include <vespa/searchlib/fef/termfieldmatchdataarray.h>
#include "andsearch.h"