FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/45924 ([C++0x] bind<R>(x)(y, z) fails)

Browse source 
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.

From-SVN: r165072
This commit is contained in:
Jonathan Wakely 2010-10-07 01:17:24 +01:00
parent 6619e385fc
commit b32c4963b9
2 changed files with 49 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/include/std/functional
View file

@ -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());
}
};

45
libstdc++-v3/testsuite/20_util/bind/45924.cc Normal file
View file

@ -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;
}