From patchwork Thu Oct  7 00:17:29 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v3] fix libstdc++/45924
Date: Wed, 06 Oct 2010 14:17:29 -0000
From: Jonathan Wakely <jwakely.gcc@gmail.com>
X-Patchwork-Id: 66989
Message-Id: <AANLkTineXHTMaSA9Sh0iodM3R3ypkni+Q4ZD_SDTZwX5@mail.gmail.com>
To: "libstdc++" <libstdc++@gcc.gnu.org>, gcc-patches <gcc-patches@gcc.gnu.org>

Tested x86_64-linux and committed to trunk. This is a regression so
will commit to 4.5 branch after testing.

        PR libstdc++/45924
        * include/std/functional (_Bind_result::operator()): Do not expand
        template parameter pack in forward call.
        * testsuite/20_util/bind/45924.cc: New.


Index: include/std/functional
===================================================================
--- include/std/functional	(revision 165067)
+++ include/std/functional	(working copy)
@@ -1332,7 +1332,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
         operator()(_Args&&... __args)
         {
           return this->__call<_Result>(
-              tuple<_Args...>(std::forward<_Args...>(__args)...),
+              tuple<_Args...>(std::forward<_Args>(__args)...),
               _Bound_indexes());
         }
 
@@ -1342,7 +1342,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
         operator()(_Args&&... __args) const
         {
           return this->__call<_Result>(
-              tuple<_Args...>(std::forward<_Args...>(__args)...),
+              tuple<_Args...>(std::forward<_Args>(__args)...),
               _Bound_indexes());
         }
 
@@ -1352,7 +1352,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
         operator()(_Args&&... __args) volatile
         {
           return this->__call<_Result>(
-              tuple<_Args...>(std::forward<_Args...>(__args)...),
+              tuple<_Args...>(std::forward<_Args>(__args)...),
               _Bound_indexes());
         }
 
@@ -1362,7 +1362,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
         operator()(_Args&&... __args) const volatile
         {
           return this->__call<_Result>(
-              tuple<_Args...>(std::forward<_Args...>(__args)...),
+              tuple<_Args...>(std::forward<_Args>(__args)...),
               _Bound_indexes());
         }
     };
Index: testsuite/20_util/bind/45924.cc
===================================================================
--- testsuite/20_util/bind/45924.cc	(revision 0)
+++ testsuite/20_util/bind/45924.cc	(revision 0)
@@ -0,0 +1,45 @@
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+
+// Copyright (C) 2010 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/>.
+
+#include <functional>
+
+// PR libstdc++/45924
+
+struct f
+{
+  int operator()(int, int) const { return 0; }
+};
+
+void test01()
+{
+  int i = 0;
+  using namespace std::placeholders;
+  auto b = std::bind<int>(f(), _1, _2);
+  auto const bc(b);
+  b(i, i);
+  bc(i, i);
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
+