Make it compile again with correct gcc options too.

2 files changed, 4 insertions, 5 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index b0fbee46320..f9036c2669f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -351,11 +351,11 @@ StoreOnlyFeedView::handleUpdate(FeedToken *token, const UpdateOperation &updOp)
 }
 
 void StoreOnlyFeedView::putSummary(SerialNum serialNum,  search::DocumentIdT lid,
-                                   FutureDoc futureDoc, OnOperationDoneType onDone)
+                                   const FutureDoc & futureDoc, OnOperationDoneType onDone)
 {
     _pendingLidTracker.produce(lid);
     summaryExecutor().execute(
-            makeLambdaTask([serialNum, futureDoc = std::move(futureDoc), lid, onDone, this] {
+            makeLambdaTask([=] {
                 (void) onDone;
                 const Document::UP & doc = futureDoc.get();
                 if (doc) {
@@ -436,11 +436,10 @@ StoreOnlyFeedView::internalUpdate(FeedToken::UP token, const UpdateOperation &up
             putSummary(serialNum, lid, futureDoc, onWriteDone);
         }
 
-        Document::UP prevDoc(_summaryAdapter->get(lid, *_repo));
         _writeService
                 .attributeFieldWriter()
                 .execute(serialNum,
-                         [upd = updOp.getUpdate(), serialNum, prevDoc = std::move(prevDoc), onWriteDone,
+                         [upd = updOp.getUpdate(), serialNum, prevDoc = _summaryAdapter->get(lid, *_repo), onWriteDone,
                           promisedDoc = std::move(promisedDoc), this]() mutable
                          {
                              makeUpdatedDocument(serialNum, std::move(prevDoc), upd,
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
index e0a871c9cc6..2cec0aba4f9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
@@ -145,7 +145,7 @@ private:
     searchcorespi::index::IThreadService & summaryExecutor() {
         return _writeService.summary();
     }
-    void putSummary(SerialNum serialNum,  search::DocumentIdT lid, FutureDoc doc, OnOperationDoneType onDone);
+    void putSummary(SerialNum serialNum,  search::DocumentIdT lid, const FutureDoc & doc, OnOperationDoneType onDone);
     void putSummary(SerialNum serialNum,  search::DocumentIdT lid, Document::SP doc, OnOperationDoneType onDone);
     void removeSummary(SerialNum serialNum,  search::DocumentIdT lid);
     void heartBeatSummary(SerialNum serialNum);