LWG4370 Comparison of optional<T> to T may be ill-formed

Author: eisenwave

source/utilities.tex

@@ -5256,7 +5256,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? *x == v : false;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return *x == v;
+return false;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator==}{optional}%
@@ -5273,7 +5278,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? v == *x : false;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return *x == v;
+return false;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator"!=}{optional}%
@@ -5290,7 +5300,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? *x != v : true;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return *x != v;
+return true;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator"!=}{optional}%
@@ -5307,7 +5322,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? v != *x : true;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return *x != v;
+return true;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator<}{optional}%
@@ -5324,7 +5344,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? *x < v : true;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return *x < v;
+return true;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator<}{optional}%
@@ -5341,7 +5366,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? v < *x : false;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return v == *x;
+return false;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator>}{optional}%
@@ -5358,7 +5388,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? *x > v : false;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return *x > v;
+return false;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator>}{optional}%
@@ -5375,7 +5410,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? v > *x : true;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return v > *x;
+return true;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator<=}{optional}%
@@ -5392,7 +5432,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? *x <= v : true;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return *x <= v;
+return true;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator<=}{optional}%
@@ -5409,7 +5454,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? v <= *x : false;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return v <= *x;
+return false;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator>=}{optional}%
@@ -5426,7 +5476,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? *x >= v : false;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return *x >= v;
+return false;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator>=}{optional}%
@@ -5443,7 +5498,12 @@
 
 \pnum
 \effects
-Equivalent to: \tcode{return x.has_value() ? v >= *x : true;}
+Equivalent to:
+\begin{codeblock}
+if (x.has_value())
+  return v >= *x;
+return true;
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{operator<=>}{optional}%