Merge 2023-11 LWG Motion 5

P2905R2 Runtime format strings

Author: tkoeppe

source/iostreams.tex

@@ -6790,11 +6790,11 @@
 \effects
 If the ordinary literal encoding\iref{lex.charset} is UTF-8, equivalent to:
 \begin{codeblock}
-vprint_unicode(os, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
+vprint_unicode(os, fmt.@\exposid{str}@, make_format_args(args...));
 \end{codeblock}
 Otherwise, equivalent to:
 \begin{codeblock}
-vprint_nonunicode(os, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
+vprint_nonunicode(os, fmt.@\exposid{str}@, make_format_args(args...));
 \end{codeblock}
 \end{itemdescr}
 
@@ -7699,11 +7699,11 @@
 \effects
 If the ordinary literal encoding\iref{lex.charset} is UTF-8, equivalent to:
 \begin{codeblock}
-vprint_unicode(stream, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
+vprint_unicode(stream, fmt.@\exposid{str}@, make_format_args(args...));
 \end{codeblock}
 Otherwise, equivalent to:
 \begin{codeblock}
-vprint_nonunicode(stream, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
+vprint_nonunicode(stream, fmt.@\exposid{str}@, make_format_args(args...));
 \end{codeblock}
 \end{itemdescr}
 

source/utilities.tex

@@ -15712,10 +15712,10 @@
 
   template<class Context = format_context, class... Args>
     @\exposid{format-arg-store}@<Context, Args...>
-      make_format_args(Args&&... fmt_args);
+      make_format_args(Args&... fmt_args);
   template<class... Args>
     @\exposid{format-arg-store}@<wformat_context, Args...>
-      make_wformat_args(Args&&... args);
+      make_wformat_args(Args&... args);
 
   // \ref{format.error}, class \tcode{format_error}
   class format_error;
@@ -18420,14 +18420,14 @@
 \indexlibraryglobal{make_format_args}%
 \begin{itemdecl}
 template<class Context = format_context, class... Args>
-  @\exposid{format-arg-store}@<Context, Args...> make_format_args(Args&&... fmt_args);
+  @\exposid{format-arg-store}@<Context, Args...> make_format_args(Args&... fmt_args);
 \end{itemdecl}
 
 \begin{itemdescr}
 \pnum
 \expects
 The type
-\tcode{typename Context::template formatter_type<remove_cvref_t<}$\tcode{T}_i$\tcode{>>}\linebreak{}
+\tcode{typename Context::template formatter_type<remove_const_t<}$\tcode{T}_i$\tcode{>>}\linebreak{}
 meets the \newoldconcept{BasicFormatter} requirements\iref{formatter.requirements}
 for each $\tcode{T}_i$ in \tcode{Args}.
 
@@ -18441,7 +18441,7 @@
 \indexlibraryglobal{make_wformat_args}%
 \begin{itemdecl}
 template<class... Args>
-  @\exposid{format-arg-store}@<wformat_context, Args...> make_wformat_args(Args&&... args);
+  @\exposid{format-arg-store}@<wformat_context, Args...> make_wformat_args(Args&... args);
 \end{itemdecl}
 
 \begin{itemdescr}