diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-10 16:35:58 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-10 16:35:58 +0000 |
| commit | 0bf923d1dbf60a96d1533656637e7915461664fd (patch) | |
| tree | 4430596b5d7f9a20c9ab537305441dd639b8f66a /libstdc++-v3/include/std/functional | |
| parent | aaa7afaba07f9b96e0afcf7131cef3f087fbdc28 (diff) | |
| download | gcc-0bf923d1dbf60a96d1533656637e7915461664fd.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172244 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/functional')
| -rw-r--r-- | libstdc++-v3/include/std/functional | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |