From: Marshall Clow Date: Wed, 27 May 2015 22:44:47 +0000 (+0000) Subject: Fix PR#23647 - make_shared - second try X-Git-Tag: llvmorg-3.7.0-rc1~3653 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7fb9a041dbcf66e8bff5fefcbdae3fc842bfabc;p=platform%2Fupstream%2Fllvm.git Fix PR#23647 - make_shared - second try llvm-svn: 238370 --- diff --git a/libcxx/include/memory b/libcxx/include/memory index 4af72c3..a0e7a8b 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 friend class _LIBCPP_TYPE_VIS_ONLY shared_ptr; template 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 9cb4ff1..1045f93 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(true); -// test(3); -// test(5.0); + test(true); + test(3); + test(5.0); }