maybe netbsd is more pedantic about this?

diff --git a/tools/hscollider/UltimateTruth.cpp b/tools/hscollider/UltimateTruth.cpp
index 93d432c30a5d512f5a26fde2863e1bd1d537a4a7..e33ce2fb0d13357c94b1ca64788d92407510cc14 100644 (file)
--- a/tools/hscollider/UltimateTruth.cpp
+++ b/tools/hscollider/UltimateTruth.cpp
@@ -1079,7 +1079,7 @@ shared_ptr<BaseDB> UltimateTruth::compile(const set<unsigned> &ids,
         }
     }
 
-    return std::move(db);
+    return db;
 }
 
 bool UltimateTruth::allocScratch(shared_ptr<const BaseDB> db) {

diff --git a/tools/hscollider/main.cpp b/tools/hscollider/main.cpp
index dcc5c1b696d92ffd68df109081be96943c7ccd6f..0decc81051b3fd5fd2d125b08941fc81f4631d05 100644 (file)
--- a/tools/hscollider/main.cpp
+++ b/tools/hscollider/main.cpp
@@ -1830,11 +1830,11 @@ unique_ptr<CorporaSource> buildCorpora(const vector<string> &corporaFiles,
                 exit_with_fail();
             }
         }
-        return std::move(c); /* move allows unique_ptr<CorporaSource> conversion */
+        return c;
     } else {
         auto c = std::make_unique<NfaGeneratedCorpora>(
             exprMap, corpus_gen_prop, force_utf8, force_prefilter);
-        return std::move(c);
+        return c;
     }
 }