[func.wrap.ref.deduct] Replace constant_arg_t with constant_wrapper in deduction guides

Author: eisenwave

source/utilities.tex

@@ -15193,10 +15193,10 @@
   // \ref{func.wrap.ref.deduct}, deduction guides
   template<class F>
     function_ref(F*) -> function_ref<F>;
-  template<auto f>
-    function_ref(constant_arg_t<f>) -> function_ref<@\seebelow@>;
-  template<auto f, class T>
-    function_ref(constant_arg_t<f>, T&&) -> function_ref<@\seebelow@>;
+  template<auto c, class F0>
+    function_ref(constant_wrapper<c, F>) -> function_ref<@\seebelow@>;
+  template<auto c, class F, class T>
+    function_ref(constant_wrapper<c, F>, T&&) -> function_ref<@\seebelow@>;
 }
 \end{codeblock}
 
@@ -15446,13 +15446,13 @@
 \end{itemdescr}
 
 \begin{itemdecl}
-template<auto f>
-  function_ref(constant_arg_t<f>) -> function_ref<@\seebelow@>;
+template<auto c, class F0>
+  function_ref(constant_wrapper<c, F0>) -> function_ref<@\seebelow@>;
 \end{itemdecl}
 
 \begin{itemdescr}
 \pnum
-Let \tcode{F} be \tcode{remove_pointer_t<decltype(f)>}.
+Let \tcode{F} be \tcode{remove_pointer_t<F0>}.
 
 \pnum
 \constraints
@@ -15464,14 +15464,11 @@
 \end{itemdescr}
 
 \begin{itemdecl}
-template<auto f, class T>
-  function_ref(constant_arg_t<f>, T&&) -> function_ref<@\seebelow@>;
+template<auto c, class F, class T>
+  function_ref(constant_wrapper<c, F>, T&&) -> function_ref<@\seebelow@>;
 \end{itemdecl}
 
 \begin{itemdescr}
-\pnum
-Let \tcode{F} be \tcode{decltype(f)}.
-
 \pnum
 \constraints
 %FIXME: R and E should be defined outside of these constraints.