summaryrefslogtreecommitdiffstats
path: root/searchcore/src
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-10-07 16:59:55 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-10-07 17:13:05 +0000
commit6166dd0e28ab21be14a7c5018958f394d8e779db (patch)
tree9f1ebb0f4920ad377fda2b0de44a4a45d7ec121a /searchcore/src
parentd8365f1cde0c00a5a671f87c0baad461beff28c2 (diff)
Remove broken copy and move constructor and assignment operatoos on vespalib::Lock and vespalib::Monitor.
Also repair broken usages of the same.
Diffstat (limited to 'searchcore/src')
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/partial_result.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/partial_result.h b/searchcore/src/vespa/searchcore/proton/matching/partial_result.h
index 5bcc8dafea2..ac3c6ab5e0f 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/partial_result.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/partial_result.h
@@ -5,6 +5,7 @@
#include <vespa/vespalib/util/dual_merge_director.h>
#include <vespa/searchlib/common/rankedhit.h>
#include <vector>
+#include <cassert>
namespace proton::matching {
@@ -28,7 +29,7 @@ private:
public:
PartialResult(size_t maxSize_in, bool hasSortData_in);
- ~PartialResult();
+ ~PartialResult() override;
size_t size() const { return _hits.size(); }
size_t maxSize() const { return _maxSize; }
size_t totalHits() const { return _totalHits; }