[cmp.categories.pre] Merge enumerators from eq into ord

Author: CaseyCarter

source/support.tex

@@ -4076,9 +4076,8 @@
 from one of the following exposition-only enumerations:
 
 \begin{codeblock}
-enum class @\placeholdernc{eq}@ { @\placeholdernc{equal}@ = 0, @\placeholdernc{equivalent}@ = @\placeholdernc{equal}@ };            // \expos
-enum class @\placeholdernc{ord}@ { @\placeholdernc{less}@ = -1, @\placeholdernc{greater}@ = 1 };                  // \expos
-enum class @\placeholdernc{ncmp}@ { @\placeholdernc{unordered}@ = -127 };                       // \expos
+enum class @\placeholdernc{ord}@ { @\placeholdernc{equal}@ = 0, @\placeholdernc{equivalent}@ = @\placeholdernc{equal}@, @\placeholdernc{less}@ = -1, @\placeholdernc{greater}@ = 1 }; // \expos
+enum class @\placeholdernc{ncmp}@ { @\placeholdernc{unordered}@ = -127 };                                     // \expos
 \end{codeblock}
 
 \pnum
@@ -4129,8 +4128,6 @@
     bool is_ordered;    // \expos
 
     // exposition-only constructors
-    constexpr explicit
-      partial_ordering(@\placeholder{eq}@ v) noexcept : value(int(v)), is_ordered(true) {}      // \expos
     constexpr explicit
       partial_ordering(@\placeholder{ord}@ v) noexcept : value(int(v)), is_ordered(true) {}     // \expos
     constexpr explicit
@@ -4160,7 +4157,7 @@
 
   // valid values' definitions
   inline constexpr partial_ordering partial_ordering::less(@\placeholder{ord}@::@\placeholder{less}@);
-  inline constexpr partial_ordering partial_ordering::equivalent(@\placeholder{eq}@::@\placeholder{equivalent}@);
+  inline constexpr partial_ordering partial_ordering::equivalent(@\placeholder{ord}@::@\placeholder{equivalent}@);
   inline constexpr partial_ordering partial_ordering::greater(@\placeholder{ord}@::@\placeholder{greater}@);
   inline constexpr partial_ordering partial_ordering::unordered(@\placeholder{ncmp}@::@\placeholder{unordered}@);
 }
@@ -4242,7 +4239,6 @@
     int value;  // \expos
 
     // exposition-only constructors
-    constexpr explicit weak_ordering(@\placeholder{eq}@ v) noexcept : value(int(v)) {}  // \expos
     constexpr explicit weak_ordering(@\placeholder{ord}@ v) noexcept : value(int(v)) {} // \expos
 
   public:
@@ -4271,7 +4267,7 @@
 
   // valid values' definitions
   inline constexpr weak_ordering weak_ordering::less(@\placeholder{ord}@::@\placeholder{less}@);
-  inline constexpr weak_ordering weak_ordering::equivalent(@\placeholder{eq}@::@\placeholder{equivalent}@);
+  inline constexpr weak_ordering weak_ordering::equivalent(@\placeholder{ord}@::@\placeholder{equivalent}@);
   inline constexpr weak_ordering weak_ordering::greater(@\placeholder{ord}@::@\placeholder{greater}@);
 }
 \end{codeblock}
@@ -4368,7 +4364,6 @@
     int value;  // \expos
 
     // exposition-only constructors
-    constexpr explicit strong_ordering(@\placeholder{eq}@ v) noexcept : value(int(v)) {}    // \expos
     constexpr explicit strong_ordering(@\placeholder{ord}@ v) noexcept : value(int(v)) {}   // \expos
 
   public:
@@ -4399,8 +4394,8 @@
 
   // valid values' definitions
   inline constexpr strong_ordering strong_ordering::less(@\placeholder{ord}@::@\placeholder{less}@);
-  inline constexpr strong_ordering strong_ordering::equal(@\placeholder{eq}@::@\placeholder{equal}@);
-  inline constexpr strong_ordering strong_ordering::equivalent(@\placeholder{eq}@::@\placeholder{equivalent}@);
+  inline constexpr strong_ordering strong_ordering::equal(@\placeholder{ord}@::@\placeholder{equal}@);
+  inline constexpr strong_ordering strong_ordering::equivalent(@\placeholder{ord}@::@\placeholder{equivalent}@);
   inline constexpr strong_ordering strong_ordering::greater(@\placeholder{ord}@::@\placeholder{greater}@);
 }
 \end{codeblock}