diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-09-13 23:56:00 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-09-13 23:56:00 +0000 |
| commit | 84f996fb2e4865452220fce20e2d16890b500828 (patch) | |
| tree | 5bc639d3be5ec0f2cea9d65fbef56c219e667b5d | |
| parent | f35fc7ad74727e26413bd15fed6ceb7274d4bd8c (diff) | |
| download | bcm5719-llvm-84f996fb2e4865452220fce20e2d16890b500828.tar.gz bcm5719-llvm-84f996fb2e4865452220fce20e2d16890b500828.zip | |
G M: Make shared_ptr a little more gentle for some compilers. No impact on clang.
llvm-svn: 190732
| -rw-r--r-- | libcxx/include/memory | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/memory b/libcxx/include/memory index 79cfe9df74d..3a98d1d5e27 100644 --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -3895,8 +3895,8 @@ public: < !is_array<_Yp>::value && is_convertible<_Yp*, element_type*>::value, - shared_ptr& - >::type + shared_ptr + >::type& operator=(auto_ptr<_Yp>&& __r); #else // _LIBCPP_HAS_NO_RVALUE_REFERENCES template<class _Yp> @@ -4522,8 +4522,8 @@ typename enable_if < !is_array<_Yp>::value && is_convertible<_Yp*, _Tp*>::value, - shared_ptr<_Tp>& ->::type + shared_ptr<_Tp> +>::type& shared_ptr<_Tp>::operator=(auto_ptr<_Yp>&& __r) { shared_ptr(_VSTD::move(__r)).swap(*this); |
