diff options
9 files changed, 2 insertions, 8 deletions
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp index a3f7f803dae..6a098667be8 100644 --- a/searchcore/src/tests/proton/index/indexmanager_test.cpp +++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp @@ -20,7 +20,6 @@ #include <vespa/searchlib/common/serialnum.h> #include <vespa/searchlib/util/dirtraverse.h> #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/vespalib/util/sync.h> #include <vespa/vespalib/util/threadstackexecutor.h> #include <vespa/vespalib/util/blockingthreadstackexecutor.h> #include <vespa/vespalib/io/fileutil.h> @@ -50,7 +49,6 @@ using search::queryeval::Source; using std::set; using std::string; using vespalib::BlockingThreadStackExecutor; -using vespalib::Gate; using vespalib::ThreadStackExecutor; using namespace proton; diff --git a/searchcore/src/vespa/searchcore/proton/common/feedtoken.h b/searchcore/src/vespa/searchcore/proton/common/feedtoken.h index bc7e249ca3b..ab3fdea3345 100644 --- a/searchcore/src/vespa/searchcore/proton/common/feedtoken.h +++ b/searchcore/src/vespa/searchcore/proton/common/feedtoken.h @@ -3,7 +3,6 @@ #include <vespa/persistence/spi/persistenceprovider.h> #include <vespa/searchlib/common/idestructorcallback.h> -#include <vespa/vespalib/util/sync.h> #include <atomic> namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp b/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp index 6b5d89cbd22..bddbfed371f 100644 --- a/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp +++ b/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp @@ -3,7 +3,6 @@ #include "doctypename.h" #include <vespa/vespalib/util/exceptions.h> -#include <vespa/vespalib/util/sync.h> #include <vespa/vespalib/util/sequence.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/stllike/hash_map.h> diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h index e9e69c35bd4..a0aefd150f5 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h +++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h @@ -4,7 +4,6 @@ #include "isearchcontext.h" #include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/util/sync.h> #include <vespa/searchlib/queryeval/searchiterator.h> #include <vespa/searchlib/queryeval/blueprint.h> diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.h b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.h index bc7a8038974..165762d5356 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.h +++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.h @@ -7,7 +7,6 @@ #include <vespa/searchlib/queryeval/searchable.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/util/sync.h> #include <vespa/searchlib/queryeval/searchiterator.h> #include <vespa/searchlib/queryeval/blueprint.h> #include <atomic> diff --git a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h index 4dfcbe89d68..67f8e6dcacf 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h +++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h @@ -4,7 +4,6 @@ #include "documentdb_tagged_metrics.h" #include "job_tracker.h" #include <vespa/searchcorespi/flush/iflushtarget.h> -#include <vespa/vespalib/util/sync.h> #include <chrono> #include <mutex> diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h index d069f7953f3..27b9ffa9b88 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h @@ -4,6 +4,7 @@ #include <vespa/persistence/spi/result.h> #include <vespa/searchcore/proton/common/feedtoken.h> #include <vespa/vespalib/util/sequence.h> +#include <vespa/vespalib/util/sync.h> #include <mutex> namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp index 8091196cc4b..a5523083df7 100644 --- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp @@ -2,7 +2,6 @@ #include "executorthreadingservice.h" #include <vespa/vespalib/util/executor.h> -#include <vespa/vespalib/util/sync.h> using vespalib::ThreadStackExecutorBase; diff --git a/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp b/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp index 194e190bb7b..3d770fad313 100644 --- a/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp @@ -3,6 +3,7 @@ #include "removedonecontext.h" #include "removedonetask.h" #include <vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.h> +#include <cassert> namespace proton { |