1 files changed, 4 insertions, 2 deletions
diff --git a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp
index 8730e25e52b..12f91bf0fb6 100644
--- a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp
+++ b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp
@@ -26,7 +26,8 @@ std::unique_ptr<BucketTask>
 DummyBucketExecutor::execute(const Bucket & bucket, std::unique_ptr<BucketTask> task) {
     {
         std::unique_lock guard(_lock);
-        while (_inFlight.contains(bucket.getBucket())) {
+        // Use contains when dropping support for gcc 8.
+        while (_inFlight.count(bucket.getBucket()) != 0) {
             _cond.wait(guard);
         }
         _inFlight.insert(bucket.getBucket());
@@ -34,7 +35,8 @@ DummyBucketExecutor::execute(const Bucket & bucket, std::unique_ptr<BucketTask>
     _executor->execute(makeLambdaTask([this, bucket, bucketTask=std::move(task)]() {
         bucketTask->run(bucket, makeLambdaCallback([this, bucket]() {
             std::unique_lock guard(_lock);
-            assert(_inFlight.contains(bucket.getBucket()));
+            // Use contains when dropping support for gcc 8.
+            assert(_inFlight.count(bucket.getBucket()) != 0);
             _inFlight.erase(bucket.getBucket());
             _cond.notify_all();
         }));