Skip to content

Commit 6c6bd99

Browse files
authored
Merge 2024-11 LWG Motion 6
P2862R1 text_encoding::name() should never return null values
2 parents 8df8512 + 79af02d commit 6c6bd99

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

source/text.tex

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5115,7 +5115,7 @@
51155115
\tcode{e.mib() == text_encoding::id::other} is \tcode{false}
51165116
maintains the following invariants:
51175117
\begin{itemize}
5118-
\item \tcode{e.name() == nullptr} is \tcode{false}, and
5118+
\item \tcode{*e.name() == '\textbackslash 0'} is \tcode{false}, and
51195119
\item \tcode{e.mib() == text_encoding(e.name()).mib()} is \tcode{true}.
51205120
\end{itemize}
51215121

@@ -5215,13 +5215,10 @@
52155215
\begin{itemdescr}
52165216
\pnum
52175217
\returns
5218-
\exposid{name_} if \tcode{(\exposid{name_}[0] != '\textbackslash 0')}
5219-
is \tcode{true}, and
5220-
\keyword{nullptr} otherwise.
5218+
\exposid{name_}.
52215219

52225220
\pnum
52235221
\remarks
5224-
If \tcode{name() == nullptr} is \tcode{false},
52255222
\tcode{name()} is an \ntbs{} and
52265223
accessing elements of \exposid{name_}
52275224
outside of the range \countedrange{name()}{strlen(name()) + 1}

0 commit comments

Comments
 (0)