Skip to content

Commit 2352e4c

Browse files
authored
Merge 2023-11 LWG Motion 5
P2905R2 Runtime format strings
2 parents a8140e8 + dfd1c43 commit 2352e4c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

source/iostreams.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6790,11 +6790,11 @@
67906790
\effects
67916791
If the ordinary literal encoding\iref{lex.charset} is UTF-8, equivalent to:
67926792
\begin{codeblock}
6793-
vprint_unicode(os, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
6793+
vprint_unicode(os, fmt.@\exposid{str}@, make_format_args(args...));
67946794
\end{codeblock}
67956795
Otherwise, equivalent to:
67966796
\begin{codeblock}
6797-
vprint_nonunicode(os, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
6797+
vprint_nonunicode(os, fmt.@\exposid{str}@, make_format_args(args...));
67986798
\end{codeblock}
67996799
\end{itemdescr}
68006800

@@ -7699,11 +7699,11 @@
76997699
\effects
77007700
If the ordinary literal encoding\iref{lex.charset} is UTF-8, equivalent to:
77017701
\begin{codeblock}
7702-
vprint_unicode(stream, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
7702+
vprint_unicode(stream, fmt.@\exposid{str}@, make_format_args(args...));
77037703
\end{codeblock}
77047704
Otherwise, equivalent to:
77057705
\begin{codeblock}
7706-
vprint_nonunicode(stream, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
7706+
vprint_nonunicode(stream, fmt.@\exposid{str}@, make_format_args(args...));
77077707
\end{codeblock}
77087708
\end{itemdescr}
77097709

source/utilities.tex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15712,10 +15712,10 @@
1571215712

1571315713
template<class Context = format_context, class... Args>
1571415714
@\exposid{format-arg-store}@<Context, Args...>
15715-
make_format_args(Args&&... fmt_args);
15715+
make_format_args(Args&... fmt_args);
1571615716
template<class... Args>
1571715717
@\exposid{format-arg-store}@<wformat_context, Args...>
15718-
make_wformat_args(Args&&... args);
15718+
make_wformat_args(Args&... args);
1571915719

1572015720
// \ref{format.error}, class \tcode{format_error}
1572115721
class format_error;
@@ -18420,14 +18420,14 @@
1842018420
\indexlibraryglobal{make_format_args}%
1842118421
\begin{itemdecl}
1842218422
template<class Context = format_context, class... Args>
18423-
@\exposid{format-arg-store}@<Context, Args...> make_format_args(Args&&... fmt_args);
18423+
@\exposid{format-arg-store}@<Context, Args...> make_format_args(Args&... fmt_args);
1842418424
\end{itemdecl}
1842518425

1842618426
\begin{itemdescr}
1842718427
\pnum
1842818428
\expects
1842918429
The type
18430-
\tcode{typename Context::template formatter_type<remove_cvref_t<}$\tcode{T}_i$\tcode{>>}\linebreak{}
18430+
\tcode{typename Context::template formatter_type<remove_const_t<}$\tcode{T}_i$\tcode{>>}\linebreak{}
1843118431
meets the \newoldconcept{BasicFormatter} requirements\iref{formatter.requirements}
1843218432
for each $\tcode{T}_i$ in \tcode{Args}.
1843318433

@@ -18441,7 +18441,7 @@
1844118441
\indexlibraryglobal{make_wformat_args}%
1844218442
\begin{itemdecl}
1844318443
template<class... Args>
18444-
@\exposid{format-arg-store}@<wformat_context, Args...> make_wformat_args(Args&&... args);
18444+
@\exposid{format-arg-store}@<wformat_context, Args...> make_wformat_args(Args&... args);
1844518445
\end{itemdecl}
1844618446

1844718447
\begin{itemdescr}

0 commit comments

Comments
 (0)