diff options
Diffstat (limited to 'libcxx/include/map')
| -rw-r--r-- | libcxx/include/map | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/libcxx/include/map b/libcxx/include/map index 106ed5259ed9..e1d5fa8a25d8 100644 --- a/libcxx/include/map +++ b/libcxx/include/map @@ -582,9 +582,9 @@ public: _NOEXCEPT_(is_nothrow_default_constructible<_Compare>::value) : _Compare() {} _LIBCPP_INLINE_VISIBILITY - __map_value_compare(_Compare c) + __map_value_compare(_Compare __c) _NOEXCEPT_(is_nothrow_copy_constructible<_Compare>::value) - : _Compare(c) {} + : _Compare(__c) {} _LIBCPP_INLINE_VISIBILITY const _Compare& key_comp() const _NOEXCEPT {return *this;} _LIBCPP_INLINE_VISIBILITY @@ -627,9 +627,9 @@ public: _NOEXCEPT_(is_nothrow_default_constructible<_Compare>::value) : comp() {} _LIBCPP_INLINE_VISIBILITY - __map_value_compare(_Compare c) + __map_value_compare(_Compare __c) _NOEXCEPT_(is_nothrow_copy_constructible<_Compare>::value) - : comp(c) {} + : comp(__c) {} _LIBCPP_INLINE_VISIBILITY const _Compare& key_comp() const _NOEXCEPT {return comp;} @@ -792,9 +792,7 @@ public: } template <class _ValueTp, - class = typename enable_if< - __is_same_uncvref<_ValueTp, value_type>::value - >::type + class = __enable_if_t<__is_same_uncvref<_ValueTp, value_type>::value> > _LIBCPP_INLINE_VISIBILITY __value_type& operator=(_ValueTp&& __v) @@ -992,7 +990,7 @@ public: protected: key_compare comp; - _LIBCPP_INLINE_VISIBILITY value_compare(key_compare c) : comp(c) {} + _LIBCPP_INLINE_VISIBILITY value_compare(key_compare __c) : comp(__c) {} public: _LIBCPP_INLINE_VISIBILITY bool operator()(const value_type& __x, const value_type& __y) const @@ -1230,13 +1228,13 @@ public: } template <class _Pp, - class = typename enable_if<is_constructible<value_type, _Pp>::value>::type> + class = __enable_if_t<is_constructible<value_type, _Pp>::value> > _LIBCPP_INLINE_VISIBILITY pair<iterator, bool> insert(_Pp&& __p) {return __tree_.__insert_unique(_VSTD::forward<_Pp>(__p));} template <class _Pp, - class = typename enable_if<is_constructible<value_type, _Pp>::value>::type> + class = __enable_if_t<is_constructible<value_type, _Pp>::value> > _LIBCPP_INLINE_VISIBILITY iterator insert(const_iterator __pos, _Pp&& __p) {return __tree_.__insert_unique(__pos.__i_, _VSTD::forward<_Pp>(__p));} @@ -1456,11 +1454,11 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, iterator> find(const _K2& __k) {return __tree_.find(__k);} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, const_iterator> find(const _K2& __k) const {return __tree_.find(__k);} #endif @@ -1470,7 +1468,7 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, size_type> count(const _K2& __k) const {return __tree_.__count_multi(__k);} #endif @@ -1479,7 +1477,7 @@ public: bool contains(const key_type& __k) const {return find(__k) != end();} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, bool> contains(const _K2& __k) const { return find(__k) != end(); } #endif // _LIBCPP_STD_VER > 17 @@ -1492,12 +1490,12 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, iterator> lower_bound(const _K2& __k) {return __tree_.lower_bound(__k);} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, const_iterator> lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);} #endif @@ -1510,11 +1508,11 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, iterator> upper_bound(const _K2& __k) {return __tree_.upper_bound(__k);} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, const_iterator> upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);} #endif @@ -1527,11 +1525,11 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, pair<iterator,iterator>> equal_range(const _K2& __k) {return __tree_.__equal_range_multi(__k);} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, pair<const_iterator,const_iterator>> equal_range(const _K2& __k) const {return __tree_.__equal_range_multi(__k);} #endif @@ -1769,7 +1767,7 @@ public: key_compare comp; _LIBCPP_INLINE_VISIBILITY - value_compare(key_compare c) : comp(c) {} + value_compare(key_compare __c) : comp(__c) {} public: _LIBCPP_INLINE_VISIBILITY bool operator()(const value_type& __x, const value_type& __y) const @@ -2000,13 +1998,13 @@ public: } template <class _Pp, - class = typename enable_if<is_constructible<value_type, _Pp>::value>::type> + class = __enable_if_t<is_constructible<value_type, _Pp>::value>> _LIBCPP_INLINE_VISIBILITY iterator insert(_Pp&& __p) {return __tree_.__insert_multi(_VSTD::forward<_Pp>(__p));} template <class _Pp, - class = typename enable_if<is_constructible<value_type, _Pp>::value>::type> + class = __enable_if_t<is_constructible<value_type, _Pp>::value>> _LIBCPP_INLINE_VISIBILITY iterator insert(const_iterator __pos, _Pp&& __p) {return __tree_.__insert_multi(__pos.__i_, _VSTD::forward<_Pp>(__p));} @@ -2128,11 +2126,11 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, iterator> find(const _K2& __k) {return __tree_.find(__k);} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, const_iterator> find(const _K2& __k) const {return __tree_.find(__k);} #endif @@ -2142,7 +2140,7 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, size_type> count(const _K2& __k) const {return __tree_.__count_multi(__k);} #endif @@ -2151,7 +2149,7 @@ public: bool contains(const key_type& __k) const {return find(__k) != end();} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, bool> contains(const _K2& __k) const { return find(__k) != end(); } #endif // _LIBCPP_STD_VER > 17 @@ -2164,12 +2162,12 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, iterator> lower_bound(const _K2& __k) {return __tree_.lower_bound(__k);} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, const_iterator> lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);} #endif @@ -2182,11 +2180,11 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, iterator> upper_bound(const _K2& __k) {return __tree_.upper_bound(__k);} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, const_iterator> upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);} #endif @@ -2199,11 +2197,11 @@ public: #if _LIBCPP_STD_VER > 11 template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, pair<iterator,iterator>> equal_range(const _K2& __k) {return __tree_.__equal_range_multi(__k);} template <typename _K2> _LIBCPP_INLINE_VISIBILITY - typename enable_if<__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type + __enable_if_t<__is_transparent<_Compare, _K2>::value, pair<const_iterator,const_iterator>> equal_range(const _K2& __k) const {return __tree_.__equal_range_multi(__k);} #endif |