Skip to content

Commit cd70ee2

Browse files
committed
Merge remote-tracking branch 'origin/main' into non_type
2 parents 352a7d2 + 0ca05d2 commit cd70ee2

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

source/algorithms.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4707,7 +4707,7 @@
47074707
\returns
47084708
The first iterator \tcode{i} in the range \range{first}{last - count}
47094709
such that for every non-negative integer \tcode{n} less than \tcode{count}
4710-
the condition $E$ is true.
4710+
the condition $E$ is \tcode{true}.
47114711
Returns \tcode{last} if no such iterator is found.
47124712

47134713
\pnum

source/text.tex

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6032,12 +6032,12 @@
60326032
For arithmetic, pointer, and string types
60336033
the \fmtgrammarterm{format-spec}
60346034
is interpreted as a \fmtgrammarterm{std-format-spec}
6035-
as described in \iref{format.string.std}.
6035+
as described in~\ref{format.string.std}.
60366036
\item
60376037
For chrono types
60386038
the \fmtgrammarterm{format-spec}
60396039
is interpreted as a \fmtgrammarterm{chrono-format-spec}
6040-
as described in \iref{time.format}.
6040+
as described in~\ref{time.format}.
60416041
\item
60426042
For user-defined \tcode{formatter} specializations,
60436043
the behavior of the \tcode{parse} member function
@@ -7206,7 +7206,7 @@
72067206
The \tcode{parse} member functions of these formatters
72077207
interpret the format specification
72087208
as a \fmtgrammarterm{std-format-spec}
7209-
as described in \ref{format.string.std}.
7209+
as described in~\ref{format.string.std}.
72107210

72117211
\pnum
72127212
Unless specified otherwise, for each type \tcode{T} for which
@@ -9520,7 +9520,7 @@
95209520

95219521
// \ref{re.alg.replace}, function template \tcode{regex_replace}
95229522
template<class OutputIterator, class BidirectionalIterator,
9523-
class traits, class charT, class ST, class SA>
9523+
class traits, class charT, class ST, class SA>
95249524
OutputIterator
95259525
regex_replace(OutputIterator out,
95269526
BidirectionalIterator first, BidirectionalIterator last,
@@ -9561,8 +9561,8 @@
95619561

95629562
// \ref{re.regiter}, class template \tcode{regex_iterator}
95639563
template<class BidirectionalIterator,
9564-
class charT = typename iterator_traits<BidirectionalIterator>::value_type,
9565-
class traits = regex_traits<charT>>
9564+
class charT = typename iterator_traits<BidirectionalIterator>::value_type,
9565+
class traits = regex_traits<charT>>
95669566
class regex_iterator;
95679567

95689568
using cregex_iterator = regex_iterator<const char*>;
@@ -9572,8 +9572,8 @@
95729572

95739573
// \ref{re.tokiter}, class template \tcode{regex_token_iterator}
95749574
template<class BidirectionalIterator,
9575-
class charT = typename iterator_traits<BidirectionalIterator>::value_type,
9576-
class traits = regex_traits<charT>>
9575+
class charT = typename iterator_traits<BidirectionalIterator>::value_type,
9576+
class traits = regex_traits<charT>>
95779577
class regex_token_iterator;
95789578

95799579
using cregex_token_iterator = regex_token_iterator<const char*>;
@@ -12096,7 +12096,7 @@
1209612096
\indexlibraryglobal{regex_replace}%
1209712097
\begin{itemdecl}
1209812098
template<class OutputIterator, class BidirectionalIterator,
12099-
class traits, class charT, class ST, class SA>
12099+
class traits, class charT, class ST, class SA>
1210012100
OutputIterator
1210112101
regex_replace(OutputIterator out,
1210212102
BidirectionalIterator first, BidirectionalIterator last,
@@ -12258,8 +12258,8 @@
1225812258
\begin{codeblock}
1225912259
namespace std {
1226012260
template<class BidirectionalIterator,
12261-
class charT = typename iterator_traits<BidirectionalIterator>::value_type,
12262-
class traits = regex_traits<charT>>
12261+
class charT = typename iterator_traits<BidirectionalIterator>::value_type,
12262+
class traits = regex_traits<charT>>
1226312263
class regex_iterator {
1226412264
public:
1226512265
using regex_type = basic_regex<charT, traits>;
@@ -12529,8 +12529,8 @@
1252912529
\begin{codeblock}
1253012530
namespace std {
1253112531
template<class BidirectionalIterator,
12532-
class charT = typename iterator_traits<BidirectionalIterator>::value_type,
12533-
class traits = regex_traits<charT>>
12532+
class charT = typename iterator_traits<BidirectionalIterator>::value_type,
12533+
class traits = regex_traits<charT>>
1253412534
class regex_token_iterator {
1253512535
public:
1253612536
using regex_type = basic_regex<charT, traits>;

0 commit comments

Comments
 (0)