| commit | 855ca203ed488d970044a6042f8ea7bee7777011 | [log] [tgz] |
|---|---|---|
| author | Marshall Clow <mclow.lists@gmail.com> | Wed May 27 22:44:47 2015 +0000 |
| committer | Marshall Clow <mclow.lists@gmail.com> | Wed May 27 22:44:47 2015 +0000 |
| tree | e0c78b602d5d9f6d1291040e21ede09653ec5b2a | |
| parent | 6030275a11c414258d8e1057b52ff6a7cb0d728c [diff] |
Fix PR#23647 - make_shared<volatile bool> - second try llvm-svn: 238370 Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project Cr-Mirrored-Commit: a7fb9a041dbcf66e8bff5fefcbdae3fc842bfabc
diff --git a/include/memory b/include/memory index 4af72c3..a0e7a8b 100644 --- a/include/memory +++ b/include/memory
@@ -4047,7 +4047,7 @@ } _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/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp index 9cb4ff1..1045f93 100644 --- a/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp +++ b/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp
@@ -55,7 +55,7 @@ int main() { -// test<bool>(true); -// test<int>(3); -// test<double>(5.0); + test<bool>(true); + test<int>(3); + test<double>(5.0); }