From 87526f461aead0b592b5111920bf49fdabf3afa9 Mon Sep 17 00:00:00 2001 From: Jens Maurer Date: Mon, 14 Dec 2020 19:48:20 +0100 Subject: [PATCH] [containers] Index exposition-only iterator-related alias templates. --- source/containers.tex | 150 +++++++++++++++++++++--------------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/source/containers.tex b/source/containers.tex index ae189efb27..c20d7c1cc1 100644 --- a/source/containers.tex +++ b/source/containers.tex @@ -3258,7 +3258,7 @@ \begin{codeblock} template - using @\placeholdernc{iter-value-type}@ = typename iterator_traits::value_type; // \expos + using @\libexposidnc{iter-value-type}@ = typename iterator_traits::value_type; // \expos \end{codeblock} \rSec2[array.syn]{Header \tcode{} synopsis} @@ -3903,9 +3903,9 @@ void clear() noexcept; }; - template>> + template>> deque(InputIterator, InputIterator, Allocator = Allocator()) - -> deque<@\placeholder{iter-value-type}@, Allocator>; + -> deque<@\exposid{iter-value-type}@, Allocator>; } \end{codeblock} @@ -4338,9 +4338,9 @@ void reverse() noexcept; }; - template>> + template>> forward_list(InputIterator, InputIterator, Allocator = Allocator()) - -> forward_list<@\placeholder{iter-value-type}@, Allocator>; + -> forward_list<@\exposid{iter-value-type}@, Allocator>; } \end{codeblock} @@ -5147,9 +5147,9 @@ void reverse() noexcept; }; - template>> + template>> list(InputIterator, InputIterator, Allocator = Allocator()) - -> list<@\placeholder{iter-value-type}@, Allocator>; + -> list<@\exposid{iter-value-type}@, Allocator>; } \end{codeblock} @@ -5840,9 +5840,9 @@ constexpr void clear() noexcept; }; - template>> + template>> vector(InputIterator, InputIterator, Allocator = Allocator()) - -> vector<@\placeholder{iter-value-type}@, Allocator>; + -> vector<@\exposid{iter-value-type}@, Allocator>; } \end{codeblock}% \indexlibrarymember{vector}{operator==}% @@ -6450,16 +6450,16 @@ The following exposition-only alias templates may appear in deduction guides for associative containers: \begin{codeblock} template - using @\placeholder{iter-value-type}@ = + using @\libexposid{iter-value-type}@ = typename iterator_traits::value_type; // \expos template - using @\placeholder{iter-key-type}@ = remove_const_t< + using @\libexposid{iter-key-type}@ = remove_const_t< typename iterator_traits::value_type::first_type>; // \expos template - using @\placeholder{iter-mapped-type}@ = + using @\libexposid{iter-mapped-type}@ = typename iterator_traits::value_type::second_type; // \expos template - using @\placeholder{iter-to-alloc-type}@ = pair< + using @\libexposid{iter-to-alloc-type}@ = pair< add_const_t::value_type::first_type>, typename iterator_traits::value_type::second_type>; // \expos \end{codeblock} @@ -6811,10 +6811,10 @@ pair equal_range(const K& x) const; }; - template>, - class Allocator = allocator<@\placeholder{iter-to-alloc-type}@>> + template>, + class Allocator = allocator<@\exposid{iter-to-alloc-type}@>> map(InputIterator, InputIterator, Compare = Compare(), Allocator = Allocator()) - -> map<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, Compare, Allocator>; + -> map<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, Compare, Allocator>; template, class Allocator = allocator>> @@ -6823,8 +6823,8 @@ template map(InputIterator, InputIterator, Allocator) - -> map<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, - less<@\placeholder{iter-key-type}@>, Allocator>; + -> map<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, + less<@\exposid{iter-key-type}@>, Allocator>; template map(initializer_list>, Allocator) -> map, Allocator>; @@ -7335,10 +7335,10 @@ pair equal_range(const K& x) const; }; - template>, - class Allocator = allocator<@\placeholder{iter-to-alloc-type}@>> + template>, + class Allocator = allocator<@\exposid{iter-to-alloc-type}@>> multimap(InputIterator, InputIterator, Compare = Compare(), Allocator = Allocator()) - -> multimap<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, + -> multimap<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, Compare, Allocator>; template, @@ -7348,8 +7348,8 @@ template multimap(InputIterator, InputIterator, Allocator) - -> multimap<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, - less<@\placeholder{iter-key-type}@>, Allocator>; + -> multimap<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, + less<@\exposid{iter-key-type}@>, Allocator>; template multimap(initializer_list>, Allocator) @@ -7638,11 +7638,11 @@ }; template>, - class Allocator = allocator<@\placeholder{iter-value-type}@>> + class Compare = less<@\exposid{iter-value-type}@>, + class Allocator = allocator<@\exposid{iter-value-type}@>> set(InputIterator, InputIterator, Compare = Compare(), Allocator = Allocator()) - -> set<@\placeholder{iter-value-type}@, Compare, Allocator>; + -> set<@\exposid{iter-value-type}@, Compare, Allocator>; template, class Allocator = allocator> set(initializer_list, Compare = Compare(), Allocator = Allocator()) @@ -7650,8 +7650,8 @@ template set(InputIterator, InputIterator, Allocator) - -> set<@\placeholder{iter-value-type}@, - less<@\placeholder{iter-value-type}@>, Allocator>; + -> set<@\exposid{iter-value-type}@, + less<@\exposid{iter-value-type}@>, Allocator>; template set(initializer_list, Allocator) -> set, Allocator>; @@ -7914,11 +7914,11 @@ }; template>, - class Allocator = allocator<@\placeholder{iter-value-type}@>> + class Compare = less<@\exposid{iter-value-type}@>, + class Allocator = allocator<@\exposid{iter-value-type}@>> multiset(InputIterator, InputIterator, Compare = Compare(), Allocator = Allocator()) - -> multiset<@\placeholder{iter-value-type}@, Compare, Allocator>; + -> multiset<@\exposid{iter-value-type}@, Compare, Allocator>; template, class Allocator = allocator> multiset(initializer_list, Compare = Compare(), Allocator = Allocator()) @@ -7926,8 +7926,8 @@ template multiset(InputIterator, InputIterator, Allocator) - -> multiset<@\placeholder{iter-value-type}@, - less<@\placeholder{iter-value-type}@>, Allocator>; + -> multiset<@\exposid{iter-value-type}@, + less<@\exposid{iter-value-type}@>, Allocator>; template multiset(initializer_list, Allocator) -> multiset, Allocator>; @@ -8380,12 +8380,12 @@ }; template>, - class Pred = equal_to<@\placeholder{iter-key-type}@>, - class Allocator = allocator<@\placeholder{iter-to-alloc-type}@>> + class Hash = hash<@\exposid{iter-key-type}@>, + class Pred = equal_to<@\exposid{iter-key-type}@>, + class Allocator = allocator<@\exposid{iter-to-alloc-type}@>> unordered_map(InputIterator, InputIterator, typename @\seebelow@::size_type = @\seebelow@, Hash = Hash(), Pred = Pred(), Allocator = Allocator()) - -> unordered_map<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, Hash, Pred, + -> unordered_map<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, Hash, Pred, Allocator>; template, @@ -8397,20 +8397,20 @@ template unordered_map(InputIterator, InputIterator, typename @\seebelow@::size_type, Allocator) - -> unordered_map<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, - hash<@\placeholder{iter-key-type}@>, - equal_to<@\placeholder{iter-key-type}@>, Allocator>; + -> unordered_map<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, + hash<@\exposid{iter-key-type}@>, + equal_to<@\exposid{iter-key-type}@>, Allocator>; template unordered_map(InputIterator, InputIterator, Allocator) - -> unordered_map<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, - hash<@\placeholder{iter-key-type}@>, - equal_to<@\placeholder{iter-key-type}@>, Allocator>; + -> unordered_map<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, + hash<@\exposid{iter-key-type}@>, + equal_to<@\exposid{iter-key-type}@>, Allocator>; template unordered_map(InputIterator, InputIterator, typename @\seebelow@::size_type, Hash, Allocator) - -> unordered_map<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, Hash, - equal_to<@\placeholder{iter-key-type}@>, Allocator>; + -> unordered_map<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, Hash, + equal_to<@\exposid{iter-key-type}@>, Allocator>; template unordered_map(initializer_list>, typename @\seebelow@::size_type, @@ -8953,13 +8953,13 @@ }; template>, - class Pred = equal_to<@\placeholder{iter-key-type}@>, - class Allocator = allocator<@\placeholder{iter-to-alloc-type}@>> + class Hash = hash<@\exposid{iter-key-type}@>, + class Pred = equal_to<@\exposid{iter-key-type}@>, + class Allocator = allocator<@\exposid{iter-to-alloc-type}@>> unordered_multimap(InputIterator, InputIterator, typename @\seebelow@::size_type = @\seebelow@, Hash = Hash(), Pred = Pred(), Allocator = Allocator()) - -> unordered_multimap<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, + -> unordered_multimap<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, Hash, Pred, Allocator>; template, @@ -8971,21 +8971,21 @@ template unordered_multimap(InputIterator, InputIterator, typename @\seebelow@::size_type, Allocator) - -> unordered_multimap<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, - hash<@\placeholder{iter-key-type}@>, - equal_to<@\placeholder{iter-key-type}@>, Allocator>; + -> unordered_multimap<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, + hash<@\exposid{iter-key-type}@>, + equal_to<@\exposid{iter-key-type}@>, Allocator>; template unordered_multimap(InputIterator, InputIterator, Allocator) - -> unordered_multimap<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, - hash<@\placeholder{iter-key-type}@>, - equal_to<@\placeholder{iter-key-type}@>, Allocator>; + -> unordered_multimap<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, + hash<@\exposid{iter-key-type}@>, + equal_to<@\exposid{iter-key-type}@>, Allocator>; template unordered_multimap(InputIterator, InputIterator, typename @\seebelow@::size_type, Hash, Allocator) - -> unordered_multimap<@\placeholder{iter-key-type}@, @\placeholder{iter-mapped-type}@, Hash, - equal_to<@\placeholder{iter-key-type}@>, Allocator>; + -> unordered_multimap<@\exposid{iter-key-type}@, @\exposid{iter-mapped-type}@, Hash, + equal_to<@\exposid{iter-key-type}@>, Allocator>; template unordered_multimap(initializer_list>, typename @\seebelow@::size_type, @@ -9320,12 +9320,12 @@ }; template>, - class Pred = equal_to<@\placeholder{iter-value-type}@>, - class Allocator = allocator<@\placeholder{iter-value-type}@>> + class Hash = hash<@\exposid{iter-value-type}@>, + class Pred = equal_to<@\exposid{iter-value-type}@>, + class Allocator = allocator<@\exposid{iter-value-type}@>> unordered_set(InputIterator, InputIterator, typename @\seebelow@::size_type = @\seebelow@, Hash = Hash(), Pred = Pred(), Allocator = Allocator()) - -> unordered_set<@\placeholder{iter-value-type}@, + -> unordered_set<@\exposid{iter-value-type}@, Hash, Pred, Allocator>; template, @@ -9336,16 +9336,16 @@ template unordered_set(InputIterator, InputIterator, typename @\seebelow@::size_type, Allocator) - -> unordered_set<@\placeholder{iter-value-type}@, - hash<@\placeholder{iter-value-type}@>, - equal_to<@\placeholder{iter-value-type}@>, + -> unordered_set<@\exposid{iter-value-type}@, + hash<@\exposid{iter-value-type}@>, + equal_to<@\exposid{iter-value-type}@>, Allocator>; template unordered_set(InputIterator, InputIterator, typename @\seebelow@::size_type, Hash, Allocator) - -> unordered_set<@\placeholder{iter-value-type}@, Hash, - equal_to<@\placeholder{iter-value-type}@>, + -> unordered_set<@\exposid{iter-value-type}@, Hash, + equal_to<@\exposid{iter-value-type}@>, Allocator>; template @@ -9647,12 +9647,12 @@ }; template>, - class Pred = equal_to<@\placeholder{iter-value-type}@>, - class Allocator = allocator<@\placeholder{iter-value-type}@>> + class Hash = hash<@\exposid{iter-value-type}@>, + class Pred = equal_to<@\exposid{iter-value-type}@>, + class Allocator = allocator<@\exposid{iter-value-type}@>> unordered_multiset(InputIterator, InputIterator, @\seebelow@::size_type = @\seebelow@, Hash = Hash(), Pred = Pred(), Allocator = Allocator()) - -> unordered_multiset<@\placeholder{iter-value-type}@, + -> unordered_multiset<@\exposid{iter-value-type}@, Hash, Pred, Allocator>; template, @@ -9663,16 +9663,16 @@ template unordered_multiset(InputIterator, InputIterator, typename @\seebelow@::size_type, Allocator) - -> unordered_multiset<@\placeholder{iter-value-type}@, - hash<@\placeholder{iter-value-type}@>, - equal_to<@\placeholder{iter-value-type}@>, + -> unordered_multiset<@\exposid{iter-value-type}@, + hash<@\exposid{iter-value-type}@>, + equal_to<@\exposid{iter-value-type}@>, Allocator>; template unordered_multiset(InputIterator, InputIterator, typename @\seebelow@::size_type, Hash, Allocator) - -> unordered_multiset<@\placeholder{iter-value-type}@, Hash, - equal_to<@\placeholder{iter-value-type}@>, + -> unordered_multiset<@\exposid{iter-value-type}@, Hash, + equal_to<@\exposid{iter-value-type}@>, Allocator>; template