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 | a7fb9a041dbcf66e8bff5fefcbdae3fc842bfabc (patch) | |
| tree | de8adf117f455753403e5de1fda8adcf37c745f8 | |
| parent | 88a8fc544848278660de7cfa2d39c4762918267c (diff) | |
| download | bcm5719-llvm-a7fb9a041dbcf66e8bff5fefcbdae3fc842bfabc.tar.gz bcm5719-llvm-a7fb9a041dbcf66e8bff5fefcbdae3fc842bfabc.zip | |
Fix PR#23647 - make_shared<volatile bool> - second try
llvm-svn: 238370
| -rw-r--r-- | libcxx/include/memory | 2 | ||||
| -rw-r--r-- | libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/memory b/libcxx/include/memory index 4af72c3da0f..a0e7a8bccc9 100644 --- a/libcxx/include/memory +++ b/libcxx/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; diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp index 9cb4ff1a7b0..1045f9347b3 100644 --- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp +++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp @@ -55,7 +55,7 @@ void test(const T &t0) int main() { -// test<bool>(true); -// test<int>(3); -// test<double>(5.0); + test<bool>(true); + test<int>(3); + test<double>(5.0); } |

