git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/48541 (std::function(std::_Function_base) should use std::addressof) 

2011-04-10  Jonathan Wakely  <jwakely.gcc@gmail.com>

	PR libstdc++/48541
	* include/std/functional (_Base_manager::_M_get_pointer): Use
	addressof.
	* testsuite/20_util/function/48541.cc: New.

From-SVN: r172244
This commit is contained in:
Jonathan Wakely 2011-04-10 16:35:58 +00:00 committed by Jonathan Wakely
parent 07703a3785
commit 3e49fb0379
3 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2011-04-10 Jonathan Wakely <jwakely.gcc@gmail.com>
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 <jwakely.gcc@gmail.com> 2011-04-10 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/48465 PR libstdc++/48465

2
libstdc++-v3/include/std/functional
View File

@ -1586,7 +1586,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
_M_get_pointer(const _Any_data& __source) _M_get_pointer(const _Any_data& __source)
{ {
const _Functor* __ptr = 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*>(); /* have stored a pointer */ : __source._M_access<_Functor*>();
return const_cast<_Functor*>(__ptr); return const_cast<_Functor*>(__ptr);
} }

40
libstdc++-v3/testsuite/20_util/function/48541.cc Normal file
View File

@ -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
// <http://www.gnu.org/licenses/>.
// libstdc++/48451
#include <functional>
struct X {
void operator () () const { }
float operator & () const { return 1.2345; }
};
void test01()
{
X x;
std::function<void()> f(x);
f();
}
int main()
{
test01();
return 0;
}