diff options
Diffstat (limited to 'libcxx/include/set')
| -rw-r--r-- | libcxx/include/set | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libcxx/include/set b/libcxx/include/set index 80cc7b04c37..ccf785ab1b0 100644 --- a/libcxx/include/set +++ b/libcxx/include/set @@ -513,7 +513,7 @@ public: #if _LIBCPP_STD_VER > 11 template <class _InputIterator> - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY set(_InputIterator __f, _InputIterator __l, const allocator_type& __a) : set(__f, __l, key_compare(), __a) {} #endif @@ -569,7 +569,7 @@ public: } #if _LIBCPP_STD_VER > 11 - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY set(initializer_list<value_type> __il, const allocator_type& __a) : set(__il, key_compare(), __a) {} #endif @@ -707,33 +707,33 @@ public: { return __tree_.template __node_handle_extract<node_type>(__it); } - template <class _C2> + template <class _Compare2> _LIBCPP_INLINE_VISIBILITY - void merge(set<key_type, _C2, allocator_type>& __source) + void merge(set<key_type, _Compare2, allocator_type>& __source) { _LIBCPP_ASSERT(__source.get_allocator() == get_allocator(), "merging container with incompatible allocator"); __tree_.__node_handle_merge_unique(__source.__tree_); } - template <class _C2> + template <class _Compare2> _LIBCPP_INLINE_VISIBILITY - void merge(set<key_type, _C2, allocator_type>&& __source) + void merge(set<key_type, _Compare2, allocator_type>&& __source) { _LIBCPP_ASSERT(__source.get_allocator() == get_allocator(), "merging container with incompatible allocator"); __tree_.__node_handle_merge_unique(__source.__tree_); } - template <class _C2> + template <class _Compare2> _LIBCPP_INLINE_VISIBILITY - void merge(multiset<key_type, _C2, allocator_type>& __source) + void merge(multiset<key_type, _Compare2, allocator_type>& __source) { _LIBCPP_ASSERT(__source.get_allocator() == get_allocator(), "merging container with incompatible allocator"); __tree_.__node_handle_merge_unique(__source.__tree_); } - template <class _C2> + template <class _Compare2> _LIBCPP_INLINE_VISIBILITY - void merge(multiset<key_type, _C2, allocator_type>&& __source) + void merge(multiset<key_type, _Compare2, allocator_type>&& __source) { _LIBCPP_ASSERT(__source.get_allocator() == get_allocator(), "merging container with incompatible allocator"); @@ -984,7 +984,7 @@ public: #if _LIBCPP_STD_VER > 11 template <class _InputIterator> - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY multiset(_InputIterator __f, _InputIterator __l, const allocator_type& __a) : multiset(__f, __l, key_compare(), __a) {} #endif @@ -1048,7 +1048,7 @@ public: } #if _LIBCPP_STD_VER > 11 - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY multiset(initializer_list<value_type> __il, const allocator_type& __a) : multiset(__il, key_compare(), __a) {} #endif @@ -1185,33 +1185,33 @@ public: { return __tree_.template __node_handle_extract<node_type>(__it); } - template <class _C2> + template <class _Compare2> _LIBCPP_INLINE_VISIBILITY - void merge(multiset<key_type, _C2, allocator_type>& __source) + void merge(multiset<key_type, _Compare2, allocator_type>& __source) { _LIBCPP_ASSERT(__source.get_allocator() == get_allocator(), "merging container with incompatible allocator"); __tree_.__node_handle_merge_multi(__source.__tree_); } - template <class _C2> + template <class _Compare2> _LIBCPP_INLINE_VISIBILITY - void merge(multiset<key_type, _C2, allocator_type>&& __source) + void merge(multiset<key_type, _Compare2, allocator_type>&& __source) { _LIBCPP_ASSERT(__source.get_allocator() == get_allocator(), "merging container with incompatible allocator"); __tree_.__node_handle_merge_multi(__source.__tree_); } - template <class _C2> + template <class _Compare2> _LIBCPP_INLINE_VISIBILITY - void merge(set<key_type, _C2, allocator_type>& __source) + void merge(set<key_type, _Compare2, allocator_type>& __source) { _LIBCPP_ASSERT(__source.get_allocator() == get_allocator(), "merging container with incompatible allocator"); __tree_.__node_handle_merge_multi(__source.__tree_); } - template <class _C2> + template <class _Compare2> _LIBCPP_INLINE_VISIBILITY - void merge(set<key_type, _C2, allocator_type>&& __source) + void merge(set<key_type, _Compare2, allocator_type>&& __source) { _LIBCPP_ASSERT(__source.get_allocator() == get_allocator(), "merging container with incompatible allocator"); |
