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 /storage | |
| parent | a4d0cd759eed68318afebbaddbc4baddc70416e2 (diff) | |
- GC the last usages of vespalib::Lock.
- Now it is only vespalib::Monitor left
Diffstat (limited to 'storage')
3 files changed, 2 insertions, 10 deletions
diff --git a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h index c977ea78f67..aa38a0d2319 100644 --- a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h @@ -4,7 +4,6 @@ #include <vespa/vespalib/util/hdr_abort.h> #include <vespa/storage/distributor/operations/operation.h> #include <vespa/storage/bucketdb/bucketdatabase.h> -#include <vespa/vespalib/util/sync.h> namespace storage { diff --git a/storage/src/vespa/storage/distributor/sentmessagemap.h b/storage/src/vespa/storage/distributor/sentmessagemap.h index 405e59f7b31..e84920b88d7 100644 --- a/storage/src/vespa/storage/distributor/sentmessagemap.h +++ b/storage/src/vespa/storage/distributor/sentmessagemap.h @@ -1,14 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/vespalib/util/sync.h> #include <map> #include <vespa/storageapi/messageapi/storagemessage.h> -namespace storage -{ - -namespace distributor { +namespace storage::distributor { class Operation; @@ -32,6 +28,3 @@ private: }; } - -} - diff --git a/storage/src/vespa/storage/storageserver/priorityconverter.h b/storage/src/vespa/storage/storageserver/priorityconverter.h index 3a4950fdb31..08669c672d5 100644 --- a/storage/src/vespa/storage/storageserver/priorityconverter.h +++ b/storage/src/vespa/storage/storageserver/priorityconverter.h @@ -5,9 +5,9 @@ #include <vespa/storage/config/config-stor-prioritymapping.h> #include <vespa/config/helper/configfetcher.h> #include <vespa/documentapi/messagebus/priority.h> -#include <vespa/vespalib/util/sync.h> #include <atomic> #include <array> +#include <mutex> namespace config {class ConfigUri; } |