From 188b98b5057faa1232500289154c0ab08a11ca07 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Wed, 27 May 2015 20:36:14 +0000
Subject: [PATCH] Revert 238354 while I figure out what broke in weak_ptr

llvm-svn: 238355
---
 libcxx/include/memory                                               | 4 ++--
 .../util.smartptr.shared.create/make_shared.volatile.pass.cpp       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libcxx/include/memory b/libcxx/include/memory
index 8dbc4cb..4af72c3 100644
--- a/libcxx/include/memory
+++ b/libcxx/include/memory
@@ -4040,14 +4040,14 @@ private:
     template <class _Yp>
         _LIBCPP_INLINE_VISIBILITY
         void
-        __enable_weak_this(const volatile enable_shared_from_this<_Yp>* __e) _NOEXCEPT
+        __enable_weak_this(const enable_shared_from_this<_Yp>* __e) _NOEXCEPT
         {
             if (__e)
                 __e->__weak_this_ = *this;
         }
 
     _LIBCPP_INLINE_VISIBILITY
-    void __enable_weak_this(const volatile void*) _NOEXCEPT {}
+    void __enable_weak_this(const 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 1045f93..9cb4ff1 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);
 }
-- 
2.7.4