diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-05-27 20:36:14 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-05-27 20:36:14 +0000 |
| commit | fc3a3ffc69e6123b4e7e789a0ab93a287a622760 (patch) | |
| tree | 35c86ab13f90f182a09432cb5d84baa3e30820a5 /include/memory | |
| parent | 83f8153b22bf793b3459be9e60d7c135284d5f79 (diff) | |
Revert 238354 while I figure out what broke in weak_ptr
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@238355 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/memory')
| -rw-r--r-- | include/memory | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/memory b/include/memory index 8dbc4cb90..4af72c3da 100644 --- a/include/memory +++ b/include/memory @@ -4040,14 +4040,14 @@ private: template <class _Yp> _LIBCPP_INLINE_VISIBILITY void - __enable_weak_this(const volatile enable_shared_from_this<_Yp>* __e) _NOEXCEPT + __enable_weak_this(const enable_shared_from_this<_Yp>* __e) _NOEXCEPT { if (__e) __e->__weak_this_ = *this; } _LIBCPP_INLINE_VISIBILITY - void __enable_weak_this(const volatile void*) _NOEXCEPT {} + void __enable_weak_this(const void*) _NOEXCEPT {} template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY shared_ptr; template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY weak_ptr; |