diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 33fe07284ac..2dae72dcf68 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -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()); } }; diff --git a/libstdc++-v3/testsuite/20_util/bind/45924.cc b/libstdc++-v3/testsuite/20_util/bind/45924.cc new file mode 100644 index 00000000000..27adb70c0c6 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/bind/45924.cc @@ -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; +} +