From: Justin Viiret <justin.viiret@intel.com>
Date: Mon, 5 Dec 2016 01:39:25 +0000 (+1100)
Subject: flat_set: modernize iter_wrapper ctors
X-Git-Tag: v4.5.0^2~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=843ead266f8a644c2fab9634cfc99f3388a61173;p=thirdparty%2Fvectorscan.git

flat_set: modernize iter_wrapper ctors
---

diff --git a/src/util/ue2_containers.h b/src/util/ue2_containers.h
index 91115b18..0292741c 100644
--- a/src/util/ue2_containers.h
+++ b/src/util/ue2_containers.h
@@ -58,8 +58,8 @@ class iter_wrapper
     : public boost::iterator_facade<iter_wrapper<WrappedIter, Value>, Value,
                                     boost::random_access_traversal_tag> {
 public:
-    iter_wrapper() {}
-    explicit iter_wrapper(const WrappedIter &it_in) : it(it_in) {}
+    iter_wrapper() = default;
+    explicit iter_wrapper(WrappedIter it_in) : it(std::move(it_in)) {}
 
     // Templated copy-constructor to allow for interoperable iterator and
     // const_iterator.
@@ -68,10 +68,10 @@ private:
 
 public:
     template <class OtherIter, class OtherValue>
-    iter_wrapper(const iter_wrapper<OtherIter, OtherValue> &other,
+    iter_wrapper(iter_wrapper<OtherIter, OtherValue> other,
                  typename std::enable_if<std::is_convertible<
                      OtherIter, WrappedIter>::value>::type * = nullptr)
-        : it(other.it) {}
+        : it(std::move(other.it)) {}
 
     WrappedIter get() const { return it; }