LWG3886 Monad mo' problems

[optional.assign] Removed "<T>" from declaration to match that in synopsis.

Author: burblebee

source/utilities.tex

@@ -3269,7 +3269,7 @@
       constexpr explicit optional(in_place_t, Args&&...);
     template<class U, class... Args>
       constexpr explicit optional(in_place_t, initializer_list<U>, Args&&...);
-    template<class U = T>
+    template<class U = remove_cv_t<T>>
       constexpr explicit(@\seebelow@) optional(U&&);
     template<class U>
       constexpr explicit(@\seebelow@) optional(const optional<U>&);
@@ -3283,7 +3283,7 @@
     constexpr optional& operator=(nullopt_t) noexcept;
     constexpr optional& operator=(const optional&);
     constexpr optional& operator=(optional&&) noexcept(@\seebelow@);
-    template<class U = T> constexpr optional& operator=(U&&);
+    template<class U = remove_cv_t<T>> constexpr optional& operator=(U&&);
     template<class U> constexpr optional& operator=(const optional<U>&);
     template<class U> constexpr optional& operator=(optional<U>&&);
     template<class... Args> constexpr T& emplace(Args&&...);
@@ -3311,8 +3311,8 @@
     constexpr T& value() &;                                             // freestanding-deleted
     constexpr T&& value() &&;                                           // freestanding-deleted
     constexpr const T&& value() const &&;                               // freestanding-deleted
-    template<class U> constexpr T value_or(U&&) const &;
-    template<class U> constexpr T value_or(U&&) &&;
+    template<class U = remove_cv_t<T>> constexpr T value_or(U&&) const &;
+    template<class U = remove_cv_t<T>> constexpr T value_or(U&&) &&;
 
     // \ref{optional.monadic}, monadic operations
     template<class F> constexpr auto and_then(F&& f) &;
@@ -3504,7 +3504,7 @@
 
 \indexlibraryctor{optional}%
 \begin{itemdecl}
-template<class U = T> constexpr explicit(@\seebelow@) optional(U&& v);
+template<class U = remove_cv_t<T>> constexpr explicit(@\seebelow@) optional(U&& v);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -3756,7 +3756,7 @@
 
 \indexlibrarymember{operator=}{optional}%
 \begin{itemdecl}
-template<class U = T> constexpr optional<T>& operator=(U&& v);
+template<class U = remove_cv_t<T>> constexpr optional& operator=(U&& v);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -4193,7 +4193,7 @@
 
 \indexlibrarymember{value_or}{optional}%
 \begin{itemdecl}
-template<class U> constexpr T value_or(U&& v) const &;
+template<class U = remove_cv_t<T>> constexpr T value_or(U&& v) const &;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -4211,7 +4211,7 @@
 
 \indexlibrarymember{value_or}{optional}%
 \begin{itemdecl}
-template<class U> constexpr T value_or(U&& v) &&;
+template<class U = remove_cv_t<T>> constexpr T value_or(U&& v) &&;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -7440,7 +7440,7 @@
     template<class U, class G>
       constexpr explicit(@\seebelow@) expected(expected<U, G>&&);
 
-    template<class U = T>
+    template<class U = remove_cv_t<T>>
       constexpr explicit(@\seebelow@) expected(U&& v);
 
     template<class G>
@@ -7463,7 +7463,7 @@
     // \ref{expected.object.assign}, assignment
     constexpr expected& operator=(const expected&);
     constexpr expected& operator=(expected&&) noexcept(@\seebelow@);
-    template<class U = T> constexpr expected& operator=(U&&);
+    template<class U = remove_cv_t<T>> constexpr expected& operator=(U&&);
     template<class G>
       constexpr expected& operator=(const unexpected<G>&);
     template<class G>
@@ -7495,8 +7495,8 @@
     constexpr E& error() & noexcept;
     constexpr const E&& error() const && noexcept;
     constexpr E&& error() && noexcept;
-    template<class U> constexpr T value_or(U&&) const &;
-    template<class U> constexpr T value_or(U&&) &&;
+    template<class U = remove_cv_t<T>> constexpr T value_or(U&&) const &;
+    template<class U = remove_cv_t<T>> constexpr T value_or(U&&) &&;
     template<class G = E> constexpr E error_or(G&&) const &;
     template<class G = E> constexpr E error_or(G&&) &&;
 
@@ -7747,7 +7747,7 @@
 
 \indexlibraryctor{expected}%
 \begin{itemdecl}
-template<class U = T>
+template<class U = remove_cv_t<T>>
   constexpr explicit(!is_convertible_v<U, T>) expected(U&& v);
 \end{itemdecl}
 
@@ -8066,7 +8066,7 @@
 
 \indexlibrarymember{operator=}{expected}%
 \begin{itemdecl}
-template<class U = T>
+template<class U = remove_cv_t<T>>
   constexpr expected& operator=(U&& v);
 \end{itemdecl}
 
@@ -8434,7 +8434,7 @@
 
 \indexlibrarymember{value_or}{expected}%
 \begin{itemdecl}
-template<class U> constexpr T value_or(U&& v) const &;
+template<class U = remove_cv_t<T>> constexpr T value_or(U&& v) const &;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -8450,7 +8450,7 @@
 
 \indexlibrarymember{value_or}{expected}%
 \begin{itemdecl}
-template<class U> constexpr T value_or(U&& v) &&;
+template<class U = remove_cv_t<T>> constexpr T value_or(U&& v) &&;
 \end{itemdecl}
 
 \begin{itemdescr}