diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fe1550810cb5..fccf7083dcb2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2013-08-07 Jonathan Wakely + + PR libstdc++/57465 + * include/std/functional + (_Function_base::_Base_manager::_M_not_empty_function): Fix overload + for pointers. + * testsuite/20_util/function/cons/57465.cc: New. + 2013-09-26 Tim Shen * regex_error.h: Remove _S_error_last to follow the standard. diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 63ba77793fde..73cddfe0f7af 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -1932,7 +1932,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) template static bool - _M_not_empty_function(const _Tp*& __fp) + _M_not_empty_function(_Tp* const& __fp) { return __fp; } template diff --git a/libstdc++-v3/testsuite/20_util/function/cons/57465.cc b/libstdc++-v3/testsuite/20_util/function/cons/57465.cc new file mode 100644 index 000000000000..44413fbd6ef9 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function/cons/57465.cc @@ -0,0 +1,31 @@ +// Copyright (C) 2013 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 +// . + +// libstdc++/57465 + +// { dg-options "-std=gnu++11" } + +#include +#include + +int main() +{ + using F = void(); + F* f = nullptr; + std::function x(f); + VERIFY( !x ); +}