diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-05-27 22:44:47 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-05-27 22:44:47 +0000 |
| commit | 60784f62deefe20952cabe220eb3f14b20c5e659 (patch) | |
| tree | e0c78b602d5d9f6d1291040e21ede09653ec5b2a /include/memory | |
| parent | fc3a3ffc69e6123b4e7e789a0ab93a287a622760 (diff) | |
Fix PR#23647 - make_shared<volatile bool> - second try
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@238370 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/memory')
| -rw-r--r-- | include/memory | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/memory b/include/memory index 4af72c3da..a0e7a8bcc 100644 --- a/include/memory +++ b/include/memory @@ -4047,7 +4047,7 @@ private: } _LIBCPP_INLINE_VISIBILITY - void __enable_weak_this(const void*) _NOEXCEPT {} + void __enable_weak_this(const volatile void*) _NOEXCEPT {} template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY shared_ptr; template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY weak_ptr; |