From f28f0dbf9b51662b67ed001d930c98d293408145 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@broadpark.no>
Date: Fri, 8 Feb 2019 12:08:09 +0100
Subject: Eliminate clang warnings in documentapi

---
 documentapi/src/tests/policies/testframe.h                   | 2 +-
 documentapi/src/vespa/documentapi/messagebus/replymerger.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'documentapi')

diff --git a/documentapi/src/tests/policies/testframe.h b/documentapi/src/tests/policies/testframe.h
index 4f4dfa7e2a8..d85cde129c0 100644
--- a/documentapi/src/tests/policies/testframe.h
+++ b/documentapi/src/tests/policies/testframe.h
@@ -161,7 +161,7 @@ public:
      */
     mbus::Message::UP setMessage(mbus::Message::UP msg) {
         std::swap(msg, _msg);
-        return std::move(msg);
+        return msg;
     }
 
     /**
diff --git a/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp b/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp
index 5a503d1b95b..69c1b00295d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp
@@ -170,7 +170,7 @@ ReplyMerger::mergedReply()
 {
     std::unique_ptr<mbus::Reply> generated;
     if (shouldReturnErrorReply()) {
-        generated = std::move(releaseGeneratedErrorReply());
+        generated = releaseGeneratedErrorReply();
     } else if (!successfullyMergedAtLeastOneReply()) {
         return createEmptyReplyResult();
     }
-- 
cgit v1.2.3