[libc++] Use _EnableIf and __iter_value_type consistently. NFCI.
Specifically, use these metafunctions consistently in areas that are
about to be affected by P1518R2's changes.
This is the NFCI part of https://reviews.llvm.org/D97742 .
The functional-change part is still waiting for P1518R2 to be
officially merged into the working draft.
GitOrigin-RevId: 199d2ebeed8382071809983f016e482b1d013b62
diff --git a/include/vector b/include/vector
index 8e2df79..4e1a46a 100644
--- a/include/vector
+++ b/include/vector
@@ -931,18 +931,18 @@
#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
template<class _InputIterator,
- class _Alloc = allocator<typename iterator_traits<_InputIterator>::value_type>,
- class = typename enable_if<__is_allocator<_Alloc>::value, void>::type
+ class _Alloc = allocator<__iter_value_type<_InputIterator>>,
+ class = _EnableIf<__is_allocator<_Alloc>::value>
>
vector(_InputIterator, _InputIterator)
- -> vector<typename iterator_traits<_InputIterator>::value_type, _Alloc>;
+ -> vector<__iter_value_type<_InputIterator>, _Alloc>;
template<class _InputIterator,
class _Alloc,
- class = typename enable_if<__is_allocator<_Alloc>::value, void>::type
+ class = _EnableIf<__is_allocator<_Alloc>::value>
>
vector(_InputIterator, _InputIterator, _Alloc)
- -> vector<typename iterator_traits<_InputIterator>::value_type, _Alloc>;
+ -> vector<__iter_value_type<_InputIterator>, _Alloc>;
#endif
template <class _Tp, class _Allocator>