From patchwork Thu Oct 7 00:17:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 66989 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 09088B6EED for ; Thu, 7 Oct 2010 11:17:51 +1100 (EST) Received: (qmail 21404 invoked by alias); 7 Oct 2010 00:17:41 -0000 Received: (qmail 21373 invoked by uid 22791); 7 Oct 2010 00:17:38 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mail-ww0-f51.google.com (HELO mail-ww0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 07 Oct 2010 00:17:32 +0000 Received: by wwb28 with SMTP id 28so190625wwb.8 for ; Wed, 06 Oct 2010 17:17:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.216.17.207 with SMTP id j57mr1531570wej.68.1286410649894; Wed, 06 Oct 2010 17:17:29 -0700 (PDT) Received: by 10.216.136.130 with HTTP; Wed, 6 Oct 2010 17:17:29 -0700 (PDT) Date: Thu, 7 Oct 2010 01:17:29 +0100 Message-ID: Subject: [v3] fix libstdc++/45924 From: Jonathan Wakely To: "libstdc++" , gcc-patches Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list 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 +// . + +#include + +// 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(f(), _1, _2); + auto const bc(b); + b(i, i); + bc(i, i); +} + +int main() +{ + test01(); + return 0; +} +