[libcxx] r238355 - Revert 238354 while I figure out what broke in weak_ptr
Marshall Clow
mclow.lists at gmail.com
Wed May 27 13:36:14 PDT 2015
Author: marshall
Date: Wed May 27 15:36:14 2015
New Revision: 238355
URL: http://llvm.org/viewvc/llvm-project?rev=238355&view=rev
Log:
Revert 238354 while I figure out what broke in weak_ptr
Modified:
libcxx/trunk/include/memory
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
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/memory?rev=238355&r1=238354&r2=238355&view=diff
==============================================================================
--- libcxx/trunk/include/memory (original)
+++ libcxx/trunk/include/memory Wed May 27 15:36:14 2015
@@ -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;
Modified: 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=238355&r1=238354&r2=238355&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp Wed May 27 15:36:14 2015
@@ -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);
}
More information about the cfe-commits
mailing list