[flat.*set.*] Consistently use \exposid

Author: tkoeppe

source/containers.tex

@@ -16337,20 +16337,20 @@
       flat_set(const container_type& cont, const Allocator& a);
 
     flat_set(sorted_unique_t, container_type cont)
-      : c(std::move(cont)), compare(key_compare()) { }
+      : @\exposid{c}@(std::move(cont)), @\exposid{compare}@(key_compare()) { }
     template<class Allocator>
       flat_set(sorted_unique_t, const container_type& cont, const Allocator& a);
 
     explicit flat_set(const key_compare& comp)
-      : c(), compare(comp) { }
+      : @\exposid{c}@(), @\exposid{compare}@(comp) { }
     template<class Allocator>
       flat_set(const key_compare& comp, const Allocator& a);
     template<class Allocator>
       explicit flat_set(const Allocator& a);
 
     template<class InputIterator>
       flat_set(InputIterator first, InputIterator last, const key_compare& comp = key_compare())
-        : c(), compare(comp)
+        : @\exposid{c}@(), @\exposid{compare}@(comp)
         { insert(first, last); }
     template<class InputIterator, class Allocator>
       flat_set(InputIterator first, InputIterator last,
@@ -16373,7 +16373,7 @@
     template<class InputIterator>
       flat_set(sorted_unique_t, InputIterator first, InputIterator last,
                const key_compare& comp = key_compare())
-        : c(first, last), compare(comp) { }
+        : @\exposid{c}@(first, last), @\exposid{compare}@(comp) { }
     template<class InputIterator, class Allocator>
       flat_set(sorted_unique_t, InputIterator first, InputIterator last,
                const key_compare& comp, const Allocator& a);
@@ -16546,14 +16546,14 @@
 \pnum
 \effects
 Initializes \exposid{c} with \tcode{std::move(cont)},
-value-initializes \tcode{compare},
-sorts the range \range{begin()}{end()} with respect to \tcode{compare}, and
+value-initializes \exposid{compare},
+sorts the range \range{begin()}{end()} with respect to \exposid{compare}, and
 finally erases all but the first element
 from each group of consecutive equivalent elements.
 
 \pnum
 \complexity
-Linear in $N$ if \tcode{cont} is sorted with respect to \tcode{compare} and
+Linear in $N$ if \tcode{cont} is sorted with respect to \exposid{compare} and
 otherwise $N \log N$, where $N$ is the value of \tcode{cont.size()} before this call.
 \end{itemdescr}
 
@@ -16690,10 +16690,10 @@
 \effects
 Adds elements to \exposid{c} as if by:
 \begin{codeblock}
-c.insert(c.end(), first, last);
+@\exposid{c}@.insert(@\exposid{c}@.end(), first, last);
 \end{codeblock}
 Then,
-sorts the range of newly inserted elements with respect to \tcode{compare};
+sorts the range of newly inserted elements with respect to \exposid{compare};
 merges the resulting sorted range and
 the sorted range of pre-existing elements into a single sorted range; and
 finally erases all but the first element
@@ -16737,11 +16737,11 @@
 Adds elements to \exposid{c} as if by:
 \begin{codeblock}
 for (const auto& e : rg) {
-  c.insert(c.end(), e);
+  @\exposid{c}@.insert(@\exposid{c}@.end(), e);
 }
 \end{codeblock}
 Then,
-sorts the range of newly inserted elements with respect to \tcode{compare};
+sorts the range of newly inserted elements with respect to \exposid{compare};
 merges the resulting sorted range and
 the sorted range of pre-existing elements into a single sorted range; and
 finally erases all but the first element
@@ -16768,7 +16768,7 @@
 Equivalent to:
 \begin{codeblock}
 ranges::swap(compare, y.compare);
-ranges::swap(c, y.c);
+ranges::swap(@\exposid{c}@, y.@\exposid{c}@);
 \end{codeblock}
 \end{itemdescr}
 
@@ -16784,7 +16784,7 @@
 
 \pnum
 \returns
-\tcode{std::move(c)}.
+\tcode{std::move(\exposid{c})}.
 \end{itemdescr}
 
 \indexlibrarymember{replace}{flat_set}%
@@ -16795,12 +16795,12 @@
 \begin{itemdescr}
 \pnum
 \expects
-The elements of \tcode{cont} are sorted with respect to \tcode{compare}, and
+The elements of \tcode{cont} are sorted with respect to \exposid{compare}, and
 \tcode{cont} contains no equal elements.
 
 \pnum
 \effects
-Equivalent to: \tcode{c = std::move(cont);}
+Equivalent to: \tcode{\exposid{c} = std::move(cont);}
 \end{itemdescr}
 
 \rSec3[flat.set.erasure]{Erasure}
@@ -16936,12 +16936,12 @@
       flat_multiset(const container_type& cont, const Allocator& a);
 
     flat_multiset(sorted_equivalent_t, container_type cont)
-      : c(std::move(cont)), compare(key_compare()) { }
+      : @\exposid{c}@(std::move(cont)), @\exposid{compare}@(key_compare()) { }
     template<class Allocator>
       flat_multiset(sorted_equivalent_t, const container_type&, const Allocator& a);
 
     explicit flat_multiset(const key_compare& comp)
-      : c(), compare(comp) { }
+      : @\exposid{c}@(), @\exposid{compare}@(comp) { }
     template<class Allocator>
       flat_multiset(const key_compare& comp, const Allocator& a);
     template<class Allocator>
@@ -16950,7 +16950,7 @@
     template<class InputIterator>
       flat_multiset(InputIterator first, InputIterator last,
                     const key_compare& comp = key_compare())
-        : c(), compare(comp)
+        : @\exposid{c}@(), @\exposid{compare}@(comp)
         { insert(first, last); }
     template<class InputIterator, class Allocator>
       flat_multiset(InputIterator first, InputIterator last,
@@ -16973,7 +16973,7 @@
     template<class InputIterator>
       flat_multiset(sorted_equivalent_t, InputIterator first, InputIterator last,
                     const key_compare& comp = key_compare())
-        : c(first, last), compare(comp) { }
+        : @\exposid{c}@(first, last), @\exposid{compare}@(comp) { }
     template<class InputIterator, class Allocator>
       flat_multiset(sorted_equivalent_t, InputIterator first, InputIterator last,
                     const key_compare& comp, const Allocator& a);