LWG3348 __cpp_lib_unwrap_ref in wrong header

Author: Dawn Perchik

source/utilities.tex

@@ -13520,11 +13520,6 @@
   template<class T> constexpr reference_wrapper<T> ref(reference_wrapper<T>) noexcept;
   template<class T> constexpr reference_wrapper<const T> cref(reference_wrapper<T>) noexcept;
 
-  template<class T> struct unwrap_reference;
-  template<class T> using @\libglobal{unwrap_reference_t}@ = typename unwrap_reference<T>::type;
-  template<class T> struct unwrap_ref_decay;
-  template<class T> using @\libglobal{unwrap_ref_decay_t}@ = typename unwrap_ref_decay<T>::type;
-
   // \ref{arithmetic.operations}, arithmetic operations
   template<class T = void> struct plus;
   template<class T = void> struct minus;
@@ -14023,34 +14018,6 @@
 \tcode{cref(t.get())}.
 \end{itemdescr}
 
-\rSec3[refwrap.unwrapref]{Transformation type trait \tcode{unwrap_reference}}
-
-\indexlibraryglobal{unwrap_reference}%
-\begin{itemdecl}
-template<class T>
-  struct unwrap_reference;
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-If \tcode{T} is
-a specialization \tcode{reference_wrapper<X>} for some type \tcode{X},
-the member typedef \tcode{type} of \tcode{unwrap_reference<T>} is \tcode{X\&},
-otherwise it is \tcode{T}.
-\end{itemdescr}
-
-\indexlibraryglobal{unwrap_ref_decay}%
-\begin{itemdecl}
-template<class T>
-  struct unwrap_ref_decay;
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-The member typedef \tcode{type} of \tcode{unwrap_ref_decay<T>}
-denotes the type \tcode{unwrap_reference_t<decay_t<T>>}.
-\end{itemdescr}
-
 \rSec2[arithmetic.operations]{Arithmetic operations}
 
 \pnum
@@ -16540,6 +16507,8 @@
   template<class... T> struct common_reference;
   template<class T> struct underlying_type;
   template<class Fn, class... ArgTypes> struct invoke_result;
+  template<class T> struct unwrap_reference;
+  template<class T> struct unwrap_ref_decay;
 
   template<class T>
     using @\libglobal{type_identity_t}@    = typename type_identity<T>::type;
@@ -16563,6 +16532,10 @@
     using @\libglobal{underlying_type_t}@  = typename underlying_type<T>::type;
   template<class Fn, class... ArgTypes>
     using @\libglobal{invoke_result_t}@    = typename invoke_result<Fn, ArgTypes...>::type;
+  template<class T>
+    using unwrap_reference_t = typename unwrap_reference<T>::type;
+  template<class T>
+    using unwrap_ref_decay_t = typename unwrap_ref_decay<T>::type;
   template<class...>
     using @\libglobal{void_t}@             = void;
 
@@ -18104,7 +18077,21 @@
 \br
  \requires{} \tcode{Fn} and all types in the template parameter pack \tcode{ArgTypes} shall
  be complete types, \cv{}~\tcode{void}, or arrays of
- unknown bound.\\
+ unknown bound.\\ \rowsep
+
+\indexlibraryglobal{unwrap_reference}%
+\tcode{template<class T>} \tcode{struct unwrap_reference;}
+ &
+ If \tcode{T} is
+ a specialization \tcode{reference_wrapper<X>} for some type \tcode{X},
+ the member typedef \tcode{type} of \tcode{unwrap_reference<T>} is \tcode{X\&},
+ otherwise it is \tcode{T}. \\ \rowsep
+
+\indexlibraryglobal{unwrap_ref_decay}%
+\tcode{template<class T>} \tcode{unwrap_ref_decay;}
+ &
+ The member typedef \tcode{type} of \tcode{unwrap_ref_decay<T>}
+ denotes the type \tcode{unwrap_reference_t<decay_t<T>>}.\\
 \end{libreqtab2a}
 
 \indexlibraryglobal{aligned_storage}%
@@ -18122,6 +18109,16 @@
 \end{codeblock}
 \end{note}
 
+\pnum
+In addition to being available via inclusion
+of the \tcode{<type_traits>} header, the templates
+\tcode{unwrap_reference},
+\tcode{unwrap_ref_decay},
+\tcode{unwrap_reference_t}, and
+\tcode{unwrap_ref_decay_t}
+are available
+when the header \tcode{<func\-tional>}\iref{functional.syn} is included.
+
 \indexlibraryglobal{common_type}%
 \pnum
 Let: