diff options
| author | Zoe Carver <z.zoelec2@gmail.com> | 2019-10-07 21:41:15 +0000 |
|---|---|---|
| committer | Zoe Carver <z.zoelec2@gmail.com> | 2019-10-07 21:41:15 +0000 |
| commit | a9d43b55c7d2f40b42a1aae7f84917d13121fce3 (patch) | |
| tree | 322a5dd0f6a49d49c5b466deb0d6e5fa61807a53 /libcxx/include | |
| parent | 33f054a316672b1ef54c9f4e6960ac1e7e5acbf5 (diff) | |
| download | bcm5719-llvm-a9d43b55c7d2f40b42a1aae7f84917d13121fce3.tar.gz bcm5719-llvm-a9d43b55c7d2f40b42a1aae7f84917d13121fce3.zip | |
[libc++] Remove C++03 variadics in shared_ptr (v2)
Summary: In my last patch (D67675) I forgot a few variadics. This patch removes the remaining make_shared and allocate_shared C++03 variadics.
Reviewers: ldionne, EricWF, mclow.lists
Subscribers: christof, dexonsmith, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D68000
llvm-svn: 373971
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/memory | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/libcxx/include/memory b/libcxx/include/memory index 0336a4d5d02..e4bde1eb7e3 100644 --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -4413,8 +4413,6 @@ shared_ptr<_Tp>::reset(_Yp* __p, _Dp __d, _Alloc __a) shared_ptr(__p, __d, __a).swap(*this); } -#ifndef _LIBCPP_HAS_NO_VARIADICS - template<class _Tp, class ..._Args> inline _LIBCPP_INLINE_VISIBILITY typename enable_if @@ -4439,74 +4437,6 @@ allocate_shared(const _Alloc& __a, _Args&& ...__args) return shared_ptr<_Tp>::allocate_shared(__a, _VSTD::forward<_Args>(__args)...); } -#else // _LIBCPP_HAS_NO_VARIADICS - -template<class _Tp> -inline _LIBCPP_INLINE_VISIBILITY -shared_ptr<_Tp> -make_shared() -{ - return shared_ptr<_Tp>::make_shared(); -} - -template<class _Tp, class _A0> -inline _LIBCPP_INLINE_VISIBILITY -shared_ptr<_Tp> -make_shared(_A0& __a0) -{ - return shared_ptr<_Tp>::make_shared(__a0); -} - -template<class _Tp, class _A0, class _A1> -inline _LIBCPP_INLINE_VISIBILITY -shared_ptr<_Tp> -make_shared(_A0& __a0, _A1& __a1) -{ - return shared_ptr<_Tp>::make_shared(__a0, __a1); -} - -template<class _Tp, class _A0, class _A1, class _A2> -inline _LIBCPP_INLINE_VISIBILITY -shared_ptr<_Tp> -make_shared(_A0& __a0, _A1& __a1, _A2& __a2) -{ - return shared_ptr<_Tp>::make_shared(__a0, __a1, __a2); -} - -template<class _Tp, class _Alloc> -inline _LIBCPP_INLINE_VISIBILITY -shared_ptr<_Tp> -allocate_shared(const _Alloc& __a) -{ - return shared_ptr<_Tp>::allocate_shared(__a); -} - -template<class _Tp, class _Alloc, class _A0> -inline _LIBCPP_INLINE_VISIBILITY -shared_ptr<_Tp> -allocate_shared(const _Alloc& __a, _A0& __a0) -{ - return shared_ptr<_Tp>::allocate_shared(__a, __a0); -} - -template<class _Tp, class _Alloc, class _A0, class _A1> -inline _LIBCPP_INLINE_VISIBILITY -shared_ptr<_Tp> -allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1) -{ - return shared_ptr<_Tp>::allocate_shared(__a, __a0, __a1); -} - -template<class _Tp, class _Alloc, class _A0, class _A1, class _A2> -inline _LIBCPP_INLINE_VISIBILITY -shared_ptr<_Tp> -allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1, _A2& __a2) -{ - return shared_ptr<_Tp>::allocate_shared(__a, __a0, __a1, __a2); -} - -#endif // _LIBCPP_HAS_NO_VARIADICS - template<class _Tp, class _Up> inline _LIBCPP_INLINE_VISIBILITY bool |
