Revert "[folly::gen] Prevent accidental moves in filter()"

[folly.git] / folly / gen / Base-inl.h

diff --git a/folly/gen/Base-inl.h b/folly/gen/Base-inl.h
index 23b919735a52ec5c8547aff4c979a12376315bed..0c4e92f4556959aff2f6a17d994eb595e86c9ae3 100644 (file)
--- a/folly/gen/Base-inl.h
+++ b/folly/gen/Base-inl.h
@@ -559,8 +559,7 @@ class Filter : public Operator<Filter<Predicate>> {
     template <class Body>
     void foreach(Body&& body) const {
       source_.foreach([&](Value value) {
-        // NB: Argument not forwarded to avoid accidental move-construction
-        if (pred_(value)) {
+        if (pred_(std::forward<Value>(value))) {
           body(std::forward<Value>(value));
         }
       });
@@ -569,8 +568,7 @@ class Filter : public Operator<Filter<Predicate>> {
     template <class Handler>
     bool apply(Handler&& handler) const {
       return source_.apply([&](Value value) -> bool {
-        // NB: Argument not forwarded to avoid accidental move-construction
-        if (pred_(value)) {
+        if (pred_(std::forward<Value>(value))) {
           return handler(std::forward<Value>(value));
         }
         return true;