Make it compatible with c++2a

7 files changed, 19 insertions, 19 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp
index 06d875151cc..089294967ee 100644
--- a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp
+++ b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp
@@ -75,8 +75,8 @@ TaskRunner::internalRunTask(InitializerTask::SP task, Context::SP context)
     // run by context executor
     assert(task->getState() == State::BLOCKED);
     setTaskRunning(*task);
-    auto done(makeLambdaTask([=]() { setTaskDone(*task, context); }));
-    _executor.execute(makeLambdaTask([=, done(std::move(done))]() mutable
+    auto done(makeLambdaTask([this, task, context]() { setTaskDone(*task, context); }));
+    _executor.execute(makeLambdaTask([task, context, done(std::move(done))]() mutable
                                      {   task->run();
                                          context->execute(std::move(done)); }));
 }
@@ -124,7 +124,7 @@ TaskRunner::runTask(InitializerTask::SP rootTask,
                     vespalib::Executor::Task::UP doneTask)
 {
     auto context(std::make_shared<Context>(rootTask, contextExecutor, std::move(doneTask)));
-    context->execute(makeLambdaTask([=]() { pollTask(context); } ));
+    context->execute(makeLambdaTask([this, context=std::move(context)]() { pollTask(context); } ));
 }
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp
index 88aea2bd86c..4b284595e99 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp
@@ -35,8 +35,8 @@ TaskDocidRangeScheduler::next_task(size_t thread_id)
         ++_next_task;
     }
     _assigned[thread_id] += work.size();
-    size_t todo = _unassigned.load(std::memory_order::memory_order_relaxed);
-    _unassigned.store(clamped_sub(todo, work.size()), std::memory_order::memory_order_relaxed);
+    size_t todo = _unassigned.load(std::memory_order_relaxed);
+    _unassigned.store(clamped_sub(todo, work.size()), std::memory_order_relaxed);
     return work;
 }
 
@@ -57,7 +57,7 @@ AdaptiveDocidRangeScheduler::take_idle(const Guard &)
 {
     size_t thread_id = _idle.back();
     _idle.pop_back();
-    _num_idle.store(_idle.size(), std::memory_order::memory_order_relaxed);
+    _num_idle.store(_idle.size(), std::memory_order_relaxed);
     assert(_workers[thread_id].is_idle);
     return thread_id;
 }
@@ -68,7 +68,7 @@ AdaptiveDocidRangeScheduler::make_idle(const Guard &, size_t thread_id)
     assert(!_workers[thread_id].is_idle);
     _workers[thread_id].is_idle = true;
     _idle.push_back(thread_id);
-    _num_idle.store(_idle.size(), std::memory_order::memory_order_relaxed);    
+    _num_idle.store(_idle.size(), std::memory_order_relaxed);
 }
 
 void
@@ -113,7 +113,7 @@ AdaptiveDocidRangeScheduler::AdaptiveDocidRangeScheduler(size_t num_threads, uin
     }
 }
 
-AdaptiveDocidRangeScheduler::~AdaptiveDocidRangeScheduler() {}
+AdaptiveDocidRangeScheduler::~AdaptiveDocidRangeScheduler() = default;
 
 DocidRange
 AdaptiveDocidRangeScheduler::first_range(size_t thread_id)
diff --git a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h
index 19e5ec0343d..7597476ec67 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h
@@ -60,7 +60,7 @@ public:
     IdleObserver() : _num_idle(_always_zero) {}
     IdleObserver(const std::atomic<size_t> &num_idle) : _num_idle(num_idle) {}
     bool is_always_zero() const { return (&_num_idle == &_always_zero); }
-    size_t get() const { return _num_idle.load(std::memory_order::memory_order_relaxed); }
+    size_t get() const { return _num_idle.load(std::memory_order_relaxed); }
 };
 
 /**
@@ -154,7 +154,7 @@ public:
     DocidRange first_range(size_t thread_id) override { return next_task(thread_id); }
     DocidRange next_range(size_t thread_id) override { return next_task(thread_id); }
     size_t total_size(size_t thread_id) const override { return _assigned[thread_id]; }
-    size_t unassigned_size() const override { return _unassigned.load(std::memory_order::memory_order_relaxed); }
+    size_t unassigned_size() const override { return _unassigned.load(std::memory_order_relaxed); }
     IdleObserver make_idle_observer() const override { return IdleObserver(); }
     DocidRange share_range(size_t, DocidRange todo) override { return todo; }
 };
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp
index 22af1dc1692..39716f93bc6 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp
@@ -44,7 +44,7 @@ DiskMemUsageForwarder::removeDiskMemUsageListener(IDiskMemUsageListener *listene
 void
 DiskMemUsageForwarder::notifyDiskMemUsage(DiskMemUsageState state)
 {
-    _executor.execute(makeLambdaTask([=]() { forward(state); }));
+    _executor.execute(makeLambdaTask([this, state]() { forward(state); }));
 }
 
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp
index a7dada3047c..3d7e5e7af57 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp
@@ -72,7 +72,7 @@ ProtonConfigurer::setAllowReconfig(bool allowReconfig)
         _allowReconfig = allowReconfig;
         if (allowReconfig) {
             // Ensure that pending config is applied
-            _executor.execute(makeLambdaTask([=]() { performReconfigure(); }));
+            _executor.execute(makeLambdaTask([this]() { performReconfigure(); }));
         }
     }
     if (!allowReconfig) {
@@ -102,7 +102,7 @@ ProtonConfigurer::reconfigure(std::shared_ptr<ProtonConfigSnapshot> configSnapsh
     std::lock_guard<std::mutex> guard(_mutex);
     _pendingConfigSnapshot = configSnapshot;
     if (_allowReconfig) {
-        _executor.execute(makeLambdaTask([=]() { performReconfigure(); }));
+        _executor.execute(makeLambdaTask([&]() { performReconfigure(); }));
     }
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
index 7cfad4f1ac1..b66822f39cc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
@@ -65,7 +65,7 @@ SearchableFeedView::putIndexedFields(SerialNum serialNum, search::DocumentIdT li
         return;
     }
     _writeService.index().execute(
-            makeLambdaTask([=] {
+            makeLambdaTask([this, serialNum, lid, newDoc, onWriteDone] {
                 performIndexPut(serialNum, lid, newDoc, onWriteDone);
             }));
 }
@@ -100,7 +100,7 @@ SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid
 void
 SearchableFeedView::heartBeatIndexedFields(SerialNum serialNum)
 {
-    _writeService.index().execute(makeLambdaTask([=] { performIndexHeartBeat(serialNum); }));
+    _writeService.index().execute(makeLambdaTask([this, serialNum] { performIndexHeartBeat(serialNum); }));
 }
 
 void
@@ -126,7 +126,7 @@ SearchableFeedView::removeIndexedFields(SerialNum serialNum, search::DocumentIdT
         return;
     }
     _writeService.index().execute(
-            makeLambdaTask([=]() {
+            makeLambdaTask([this, serialNum, lid, onWriteDone]() {
                 performIndexRemove(serialNum, lid, onWriteDone);
             }));
 }
@@ -166,7 +166,7 @@ SearchableFeedView::removeIndexedFields(SerialNum serialNum, const LidVector &li
         return;
 
     _writeService.index().execute(
-            makeLambdaTask([=]() {
+            makeLambdaTask([this, serialNum, lidsToRemove, onWriteDone]() {
                 performIndexRemove(serialNum, lidsToRemove, onWriteDone);
             }));
 }
@@ -200,7 +200,7 @@ void
 SearchableFeedView::internalForceCommit(SerialNum serialNum, OnForceCommitDoneType onCommitDone)
 {
     Parent::internalForceCommit(serialNum, onCommitDone);
-    _writeService.index().execute(makeLambdaTask([=]() { performIndexForceCommit(serialNum, onCommitDone); }));
+    _writeService.index().execute(makeLambdaTask([this, serialNum, onCommitDone]() { performIndexForceCommit(serialNum, onCommitDone); }));
     _writeService.index().wakeup();
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index 7c3c796bda3..de5d9d4b644 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -687,7 +687,7 @@ StoreOnlyFeedView::removeDocuments(const RemoveDocumentsOperation &op, bool remo
     std::shared_ptr<search::IDestructorCallback> onWriteDone;
     vespalib::Executor::Task::UP removeBatchDoneTask;
     if (explicitReuseLids) {
-        removeBatchDoneTask = makeLambdaTask([=]() { _metaStore.removeBatchComplete(lidsToRemove); });
+        removeBatchDoneTask = makeLambdaTask([this, lidsToRemove]() { _metaStore.removeBatchComplete(lidsToRemove); });
     } else {
         removeBatchDoneTask = makeLambdaTask([]() {});
     }