diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-08 21:57:35 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-08 21:57:35 +0000 |
| commit | a51725cfc47c215785ac4b24c6e18bf3d5ea475b (patch) | |
| tree | 42abc8a4ac1783f0816ffcdd7b85c30e07e7e3d3 /searchlib | |
| parent | a4d0cd759eed68318afebbaddbc4baddc70416e2 (diff) | |
- GC the last usages of vespalib::Lock.
- Now it is only vespalib::Monitor left
Diffstat (limited to 'searchlib')
4 files changed, 2 insertions, 3 deletions
diff --git a/searchlib/src/vespa/searchlib/docstore/lid_info.h b/searchlib/src/vespa/searchlib/docstore/lid_info.h index 56629e4988a..152246631a7 100644 --- a/searchlib/src/vespa/searchlib/docstore/lid_info.h +++ b/searchlib/src/vespa/searchlib/docstore/lid_info.h @@ -3,9 +3,9 @@ #pragma once #include <vespa/vespalib/util/generationhandler.h> -#include <vespa/vespalib/util/sync.h> #include <limits> #include <vector> +#include <mutex> namespace search { diff --git a/searchlib/src/vespa/searchlib/docstore/visitcache.cpp b/searchlib/src/vespa/searchlib/docstore/visitcache.cpp index c3f4214fb60..1671b6cae69 100644 --- a/searchlib/src/vespa/searchlib/docstore/visitcache.cpp +++ b/searchlib/src/vespa/searchlib/docstore/visitcache.cpp @@ -11,7 +11,6 @@ namespace search::docstore { using vespalib::ConstBufferRef; -using vespalib::LockGuard; using vespalib::DataBuffer; using vespalib::alloc::Alloc; using vespalib::alloc::MemoryAllocator; diff --git a/searchlib/src/vespa/searchlib/docstore/writeablefilechunk.h b/searchlib/src/vespa/searchlib/docstore/writeablefilechunk.h index 1c6dd58d585..cdbbd51ec77 100644 --- a/searchlib/src/vespa/searchlib/docstore/writeablefilechunk.h +++ b/searchlib/src/vespa/searchlib/docstore/writeablefilechunk.h @@ -4,6 +4,7 @@ #include "filechunk.h" #include <vespa/vespalib/util/executor.h> +#include <vespa/vespalib/util/sync.h> #include <vespa/searchlib/transactionlog/syncproxy.h> #include <vespa/fastos/file.h> #include <map> diff --git a/searchlib/src/vespa/searchlib/transactionlog/session.h b/searchlib/src/vespa/searchlib/transactionlog/session.h index ddbe218ed4e..ea78907da90 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/session.h +++ b/searchlib/src/vespa/searchlib/transactionlog/session.h @@ -3,7 +3,6 @@ #include "common.h" #include <vespa/vespalib/util/executor.h> -#include <vespa/vespalib/util/sync.h> #include <chrono> #include <deque> #include <atomic> |