Merge pull request #12660 from vespa-engine/toregge/eliminate-redundant-move

Eliminate redundant move

3 files changed, 3 insertions, 1 deletions

diff --git a/eval/src/vespa/eval/eval/test/eval_fixture.cpp b/eval/src/vespa/eval/eval/test/eval_fixture.cpp
index 57db05107bc..7c4d4caf854 100644
--- a/eval/src/vespa/eval/eval/test/eval_fixture.cpp
+++ b/eval/src/vespa/eval/eval/test/eval_fixture.cpp
@@ -15,7 +15,7 @@ std::shared_ptr<Function const> verify_function(std::shared_ptr<Function const>
         fprintf(stderr, "eval_fixture: function parse failed: %s\n", fun->get_error().c_str());
     }
     ASSERT_TRUE(!fun->has_error());
-    return std::move(fun);
+    return fun;
 }
 
 NodeTypes get_types(const Function &function, const ParamRepo &param_repo) {
diff --git a/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h b/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h
index 275fadd1e7f..c91fdd297f8 100644
--- a/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h
+++ b/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h
@@ -6,6 +6,7 @@
 #include <vespa/vespalib/util/array.h>
 #include <vespa/vespalib/util/arrayref.h>
 #include <cassert>
+#include <limits>
 
 namespace search
 {
diff --git a/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.h b/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.h
index 45de0d654fb..efa2e3f5bfa 100644
--- a/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.h
+++ b/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.h
@@ -6,6 +6,7 @@
 #include "fieldinfo.h"
 #include <vespa/searchlib/common/feature.h>
 #include <cstring>
+#include <limits>
 
 class MatchDataHeapTest;