[libcxx] r238354 - Fix PR#23647 - make_shared<volatile bool>

[Marshall Clow]

Author: marshall
Date: Wed May 27 15:15:33 2015
New Revision: 238354

URL: http://llvm.org/viewvc/llvm-project?rev=238354&view=rev
Log:
Fix PR#23647 - make_shared<volatile bool>

Added:
    libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp
Modified:
    libcxx/trunk/include/memory

Modified: libcxx/trunk/include/memory
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/memory?rev=238354&r1=238353&r2=238354&view=diff
==============================================================================
--- libcxx/trunk/include/memory (original)
+++ libcxx/trunk/include/memory Wed May 27 15:15:33 2015
@@ -4040,14 +4040,14 @@ private:
     template <class _Yp>
         _LIBCPP_INLINE_VISIBILITY
         void
-        __enable_weak_this(const enable_shared_from_this<_Yp>* __e) _NOEXCEPT
+        __enable_weak_this(const volatile enable_shared_from_this<_Yp>* __e) _NOEXCEPT
         {
             if (__e)
                 __e->__weak_this_ = *this;
         }
 
     _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;

Added: libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp?rev=238354&view=auto
==============================================================================
--- libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp (added)
+++ libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp Wed May 27 15:15:33 2015
@@ -0,0 +1,61 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <memory>
+
+// shared_ptr
+
+// template<class T, class... Args> shared_ptr<T> make_shared(Args&&... args);
+
+#include <memory>
+#include <cassert>
+
+template <typename T>
+void test(const T &t0)
+{
+    {
+    T t1 = t0;
+    std::shared_ptr<T> p0 = std::make_shared<T>(t0);
+    std::shared_ptr<T> p1 = std::make_shared<T>(t1);
+    assert(*p0 == t0);
+    assert(*p1 == t1);
+    }
+
+    {
+    const T t1 = t0;
+    std::shared_ptr<const T> p0 = std::make_shared<const T>(t0);
+    std::shared_ptr<const T> p1 = std::make_shared<const T>(t1);
+    assert(*p0 == t0);
+    assert(*p1 == t1);
+    }
+    
+    {
+    volatile T t1 = t0;
+    std::shared_ptr<volatile T> p0 = std::make_shared<volatile T>(t0);
+    std::shared_ptr<volatile T> p1 = std::make_shared<volatile T>(t1);
+    assert(*p0 == t0);
+    assert(*p1 == t1);
+    }
+
+    {
+    const volatile T t1 = t0;
+    std::shared_ptr<const volatile T> p0 = std::make_shared<const volatile T>(t0);
+    std::shared_ptr<const volatile T> p1 = std::make_shared<const volatile T>(t1);
+    assert(*p0 == t0);
+    assert(*p1 == t1);
+    }
+    
+}
+
+int main()
+{
+    test<bool>(true);
+    test<int>(3);
+    test<double>(5.0);
+}