From: Alex Coyte <a.coyte@intel.com>
Date: Tue, 12 Dec 2017 00:41:43 +0000 (+1100)
Subject: hscollider: allow conversion of FileCorpora unique_ptr to Corpora
X-Git-Tag: v4.7.0^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3da5fc7cf334330e17f346bdb32a13a17cd81588;p=thirdparty%2Fvectorscan.git

hscollider: allow conversion of FileCorpora unique_ptr to Corpora
---

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