diff options
author | sariel <shahar.ariel@verizonmedia.com> | 2021-11-01 16:56:18 +0200 |
---|---|---|
committer | sariel <shahar.ariel@verizonmedia.com> | 2021-11-01 16:56:18 +0200 |
commit | 0039fba5e9615536e81192a88e08d0fdc9fa13b4 (patch) | |
tree | 32dab3fad991266db058cf02ec190b583f9a9bce /storage | |
parent | 0d8dd535f755f6751f1b94ec3b6dfe1fe6c59846 (diff) | |
parent | f2d3685aff36e286a4aafdb90a019bbad36ddc0d (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/persistence/mergehandler.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/src/vespa/storage/persistence/mergehandler.h b/storage/src/vespa/storage/persistence/mergehandler.h index 4daec4c0689..5e66b364242 100644 --- a/storage/src/vespa/storage/persistence/mergehandler.h +++ b/storage/src/vespa/storage/persistence/mergehandler.h @@ -21,6 +21,7 @@ #include <vespa/storage/common/cluster_context.h> #include <vespa/storage/common/messagesender.h> #include <vespa/vespalib/util/monitored_refcount.h> +#include <atomic> namespace vespalib { class ISequencedTaskExecutor; } |