P1754R1 Rename concepts to standard_case for C++20

source/containers.tex

@@ -465,7 +465,7 @@
 whose member types \tcode{iterator} and \tcode{const_iterator}
 meet the
 \oldconcept{RandomAccessIterator} requirements\iref{random.access.iterators} and
-model \libconcept{ContiguousIterator}\iref{iterator.concept.contiguous}.
+model \libconcept{contiguous_iterator}\iref{iterator.concept.contiguous}.
 
 \pnum
 \tref{container.opt} lists operations that are provided
@@ -9398,7 +9398,7 @@
     bool operator<=(const queue<T, Container>& x, const queue<T, Container>& y);
   template<class T, class Container>
     bool operator>=(const queue<T, Container>& x, const queue<T, Container>& y);
-  template<class T, ThreeWayComparable Container>
+  template<class T, three_way_comparable Container>
     compare_three_way_result_t<Container>
       operator<=>(const queue<T, Container>& x, const queue<T, Container>& y);
 
@@ -9440,7 +9440,7 @@
     bool operator<=(const stack<T, Container>& x, const stack<T, Container>& y);
   template<class T, class Container>
     bool operator>=(const stack<T, Container>& x, const stack<T, Container>& y);
-  template<class T, ThreeWayComparable Container>
+  template<class T, three_way_comparable Container>
     compare_three_way_result_t<Container>
       operator<=>(const stack<T, Container>& x, const stack<T, Container>& y);
 
@@ -9678,7 +9678,7 @@
 
 \indexlibrary{\idxcode{operator<=>}!\idxcode{queue}}%
 \begin{itemdecl}
-template<class T, ThreeWayComparable Container>
+template<class T, three_way_comparable Container>
   compare_three_way_result_t<Container>
     operator<=>(const queue<T, Container>& x, const queue<T, Container>& y);
 \end{itemdecl}
@@ -10238,7 +10238,7 @@
 
 \indexlibrary{\idxcode{operator<=>}!\idxcode{stack}}%
 \begin{itemdecl}
-template<class T, ThreeWayComparable Container>
+template<class T, three_way_comparable Container>
   compare_three_way_result_t<Container>
     operator<=>(const stack<T, Container>& x, const stack<T, Container>& y);
 \end{itemdecl}
@@ -10814,7 +10814,7 @@
 \begin{itemdescr}
 \pnum
 The types
-model \libconcept{ContiguousIterator}\iref{iterator.concept.contiguous},
+model \libconcept{contiguous_iterator}\iref{iterator.concept.contiguous},
 meet the \oldconcept{RandomAccessIterator}
 requirements\iref{random.access.iterators},
 and

source/expressions.tex

@@ -2505,7 +2505,7 @@
 template<typename T>
   concept R = requires (T i) {
     typename T::type;
-    {*i} -> ConvertibleTo<const typename T::type&>;
+    {*i} -> convertible_to<const typename T::type&>;
   };
 \end{codeblock}
 A \grammarterm{requires-expression} can also be used in a
@@ -2710,14 +2710,14 @@
 
 \begin{codeblock}
 template<typename T> concept C2 = requires(T x) {
-  {*x} -> Same<typename T::inner>;
+  {*x} -> same_as<typename T::inner>;
 };
 \end{codeblock}
 
 The \grammarterm{compound-requirement} in \tcode{C2}
 requires that \tcode{*x} is a valid expression,
 that \tcode{typename T::inner} is a valid type, and
-that \tcode{Same<decltype((*x)), typename T::inner>} is satisfied.
+that \tcode{same_as<decltype((*x)), typename T::inner>} is satisfied.
 
 \begin{codeblock}
 template<typename T> concept C3 =
@@ -4934,7 +4934,7 @@
 
 \begin{example}
 \begin{codeblock}
-  void mergeable(int x) {
+  void can_merge(int x) {
     // These allocations are safe for merging:
     std::unique_ptr<char[]> a{new (std::nothrow) char[8]};
     std::unique_ptr<char[]> b{new (std::nothrow) char[8]};
@@ -4943,7 +4943,7 @@
     g(a.get(), b.get(), c.get());
   }
 
-  void unmergeable(int x) {
+  void cannot_merge(int x) {
     std::unique_ptr<char[]> a{new char[8]};
     try {
       // Merging this allocation would change its catch handler.