From 3e49fb03796af407ddfa41e6ab76e4787d349018 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sun, 10 Apr 2011 16:35:58 +0000 Subject: [PATCH] re PR libstdc++/48541 (std::function(std::_Function_base) should use std::addressof) 2011-04-10 Jonathan Wakely PR libstdc++/48541 * include/std/functional (_Base_manager::_M_get_pointer): Use addressof. * testsuite/20_util/function/48541.cc: New. From-SVN: r172244 --- libstdc++-v3/ChangeLog | 7 ++++ libstdc++-v3/include/std/functional | 2 +- .../testsuite/20_util/function/48541.cc | 40 +++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/20_util/function/48541.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 86ae32ce9aa..3c51ed3c38f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2011-04-10 Jonathan Wakely + + PR libstdc++/48541 + * include/std/functional (_Base_manager::_M_get_pointer): Use + addressof. + * testsuite/20_util/function/48541.cc: New. + 2011-04-10 Jonathan Wakely PR libstdc++/48465 diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 6643b76493c..660e371b599 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -1586,7 +1586,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) _M_get_pointer(const _Any_data& __source) { const _Functor* __ptr = - __stored_locally? &__source._M_access<_Functor>() + __stored_locally? std::__addressof(__source._M_access<_Functor>()) /* have stored a pointer */ : __source._M_access<_Functor*>(); return const_cast<_Functor*>(__ptr); } diff --git a/libstdc++-v3/testsuite/20_util/function/48541.cc b/libstdc++-v3/testsuite/20_util/function/48541.cc new file mode 100644 index 00000000000..f8123676fe1 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function/48541.cc @@ -0,0 +1,40 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } +// Copyright (C) 2011 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++/48451 + +#include + +struct X { + void operator () () const { } + float operator & () const { return 1.2345; } +}; + +void test01() +{ + X x; + std::function f(x); + f(); +} + +int main() +{ + test01(); + return 0; +} -- 2.30.2