[PATCH 1/3] PR libstdc++/90008 remove unused capture from variant rel ops

[Jonathan Wakely]

        PR libstdc++/90008
        * include/std/variant (_VARIANT_RELATION_FUNCTION_TEMPLATE): Remove
        unused capture.
        * testsuite/20_util/variant/90008.cc: New test.

Teted powerpc64le-linux, committed to trunk.


commit 89a4191807ed2409f0e6f510ea8349392c43d9da
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Tue Apr 9 09:36:29 2019 +0100

    PR libstdc++/90008 remove unused capture from variant rel ops
    
            PR libstdc++/90008
            * include/std/variant (_VARIANT_RELATION_FUNCTION_TEMPLATE): Remove
            unused capture.
            * testsuite/20_util/variant/90008.cc: New test.

diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index 7bab47231e7..603b6be0934 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -1160,7 +1160,7 @@ namespace __variant
     { \
       bool __ret = true; \
       __do_visit<__detail::__variant::__visit_with_index>( \
-        [&__ret, &__lhs, __rhs] \
+        [&__ret, &__lhs] \
                 (auto&& __rhs_mem, auto __rhs_index) mutable \
                   -> __detail::__variant::__variant_idx_cookie \
         { \
diff --git a/libstdc++-v3/testsuite/20_util/variant/90008.cc 
b/libstdc++-v3/testsuite/20_util/variant/90008.cc
new file mode 100644
index 00000000000..53fd35db201
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/variant/90008.cc
@@ -0,0 +1,37 @@
+// Copyright (C) 2019 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++17" }
+// { dg-do compile { target c++17 } }
+
+#include <variant>
+
+struct NoCopy
+{
+  NoCopy();
+  NoCopy(const NoCopy&) = delete;
+};
+
+bool operator==(const NoCopy&, const NoCopy&);
+
+using V = std::variant<NoCopy, int>;
+
+bool
+test01(const V& lhs, const V& rhs)
+{
+  return lhs == rhs;
+}