commit a8dfc94a5abd3966204cb98281c141ae4898fdbd
author Marshall Clow <mclow.lists@gmail.com> Mon Nov 17 19:05:50 2014 +0000
committer Marshall Clow <mclow.lists@gmail.com> Mon Nov 17 19:05:50 2014 +0000
tree 5d30bd2187e9c479f019f43cb041f5a16fabdba4
parent f88ea8d422a0d357db4ee5f9a8832b54b606de70

Implement LWG2400 - 'shared_ptr's get_deleter() should use addressof()', and add tests. Mark LWG2400 and LWG2404 as complete

llvm-svn: 222161
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 278ddec22c8b95d9849fb74450b7f9f18c80421c

include/memory

diff --git a/include/memory b/include/memory
index b03ded9..662faa0 100644
--- a/include/memory
+++ b/include/memory
@@ -3660,7 +3660,7 @@
 const void*
 __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__get_deleter(const type_info& __t) const _NOEXCEPT
 {
-    return __t == typeid(_Dp) ? &__data_.first().second() : 0;
+    return __t == typeid(_Dp) ? _VSTD::addressof(__data_.first().second()) : 0;
 }
 
 #endif  // _LIBCPP_NO_RTTI