From 6166dd0e28ab21be14a7c5018958f394d8e779db Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 7 Oct 2020 16:59:55 +0000
Subject: Remove broken copy and move constructor and assignment operatoos on
 vespalib::Lock and vespalib::Monitor. Also repair broken usages of the same.

---
 searchlib/src/vespa/searchlib/bitcompression/posocc_field_params.cpp | 1 +
 searchlib/src/vespa/searchlib/index/schemautil.cpp                   | 1 +
 searchlib/src/vespa/searchlib/index/uri_field.cpp                    | 1 +
 searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp  | 1 +
 searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp          | 1 +
 searchlib/src/vespa/searchlib/transactionlog/session.cpp             | 3 ++-
 6 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'searchlib/src')

diff --git a/searchlib/src/vespa/searchlib/bitcompression/posocc_field_params.cpp b/searchlib/src/vespa/searchlib/bitcompression/posocc_field_params.cpp
index b789bf16947..751c1db50b2 100644
--- a/searchlib/src/vespa/searchlib/bitcompression/posocc_field_params.cpp
+++ b/searchlib/src/vespa/searchlib/bitcompression/posocc_field_params.cpp
@@ -5,6 +5,7 @@
 #include <vespa/searchlib/index/postinglistparams.h>
 #include <vespa/vespalib/data/fileheader.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".posocc_field_params");
diff --git a/searchlib/src/vespa/searchlib/index/schemautil.cpp b/searchlib/src/vespa/searchlib/index/schemautil.cpp
index 1fce4a1fe99..57a90892d4f 100644
--- a/searchlib/src/vespa/searchlib/index/schemautil.cpp
+++ b/searchlib/src/vespa/searchlib/index/schemautil.cpp
@@ -3,6 +3,7 @@
 #include "schemautil.h"
 #include <set>
 #include <fstream>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".index.schemautil");
diff --git a/searchlib/src/vespa/searchlib/index/uri_field.cpp b/searchlib/src/vespa/searchlib/index/uri_field.cpp
index 30b78c24410..af0881dd6b4 100644
--- a/searchlib/src/vespa/searchlib/index/uri_field.cpp
+++ b/searchlib/src/vespa/searchlib/index/uri_field.cpp
@@ -1,6 +1,7 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "uri_field.h"
+#include <cassert>
 
 namespace search::index {
 
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp
index e8257d28c63..dba6ebfb117 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_tree_analyzer.cpp
@@ -4,6 +4,7 @@
 #include <vespa/document/predicate/predicate.h>
 #include <algorithm>
 #include <cmath>
+#include <cassert>
 
 using document::Predicate;
 using std::map;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
index b7e02894e6b..97ab61d3045 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
@@ -5,6 +5,7 @@
 #include <vespa/vespalib/data/fileheader.h>
 #include <vespa/searchlib/common/fileheadercontext.h>
 #include <vespa/fastlib/io/bufferedfile.h>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".transactionlog.domainpart");
diff --git a/searchlib/src/vespa/searchlib/transactionlog/session.cpp b/searchlib/src/vespa/searchlib/transactionlog/session.cpp
index c91b719be37..3aedeb11121 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/session.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/session.cpp
@@ -3,8 +3,9 @@
 #include "domain.h"
 #include "domainpart.h"
 #include <vespa/fastlib/io/bufferedfile.h>
-#include <vespa/log/log.h>
+#include <cassert>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".transactionlog.session");
 
 using vespalib::LockGuard;
-- 
cgit v1.2.3