Skip to content

Commit 2080ad6

Browse files
JohelEGPtkoeppe
authored andcommitted
Do not use code font for "constexpr constructor" and "constexpr function". (#1484)
Completes #1153, which missed entries with a newline in-between, and utilities.tex.
1 parent 17e2802 commit 2080ad6

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

source/declarations.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@
870870
data members and base class subobjects shall be a constexpr constructor;
871871

872872
\item
873-
for a delegating constructor, the target constructor shall be a \tcode{constexpr}
873+
for a delegating constructor, the target constructor shall be a constexpr
874874
constructor.
875875
\end{itemize}
876876

@@ -916,9 +916,9 @@
916916
If the instantiated template specialization of a constexpr function
917917
template
918918
or member function of a class template
919-
would fail to satisfy the requirements for a \tcode{constexpr}
919+
would fail to satisfy the requirements for a constexpr
920920
function or constexpr constructor,
921-
that specialization is still a constexpr function or \tcode{constexpr}
921+
that specialization is still a constexpr function or constexpr
922922
constructor, even though a call to such a function cannot appear in a constant
923923
expression. If no specialization of the template would satisfy the
924924
requirements for a constexpr function or constexpr constructor
@@ -931,7 +931,7 @@
931931
non-constexpr function in all respects except that
932932
\begin{itemize}
933933
\item
934-
a call to a \tcode{constexpr}
934+
a call to a constexpr
935935
function can appear in a constant expression~(\ref{expr.const}) and
936936
\item
937937
copy elision is mandatory in a constant expression~(\ref{class.copy}).

source/expressions.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4878,7 +4878,7 @@
48784878

48794879
\begin{itemize}
48804880
\item
4881-
\tcode{this}~(\ref{expr.prim.this}), except in a \tcode{constexpr}
4881+
\tcode{this}~(\ref{expr.prim.this}), except in a constexpr
48824882
function or a constexpr constructor that is being evaluated as part
48834883
of \tcode{e};
48844884

source/lib-intro.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2746,7 +2746,7 @@
27462746
\tcode{constexpr}~(\ref{dcl.constexpr}). An implementation shall not declare
27472747
any standard library function signature as \tcode{constexpr} except for those where
27482748
it is explicitly required.
2749-
Within any header that provides any non-defining declarations of \tcode{constexpr}
2749+
Within any header that provides any non-defining declarations of constexpr
27502750
functions or constructors an implementation shall provide corresponding definitions.
27512751

27522752
\rSec3[algorithm.stable]{Requirements for stable algorithms}

source/utilities.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2743,7 +2743,7 @@
27432743

27442744
\pnum
27452745
\remarks
2746-
If \tcode{T}'s constructor selected for the initialization is a constexpr constructor, this constructor shall be a \tcode{constexpr} constructor.
2746+
If \tcode{T}'s constructor selected for the initialization is a constexpr constructor, this constructor shall be a constexpr constructor.
27472747
This constructor shall not participate in overload resolution
27482748
unless \tcode{is_constructible_v<T, Args...>} is \tcode{true}.
27492749
\end{itemdescr}
@@ -2770,7 +2770,7 @@
27702770
\pnum
27712771
\remarks
27722772
This constructor shall not participate in overload resolution unless \tcode{is_constructible_v<T, initializer_list<U>\&, Args\&\&...>} is \tcode{true}.
2773-
If \tcode{T}'s constructor selected for the initialization is a constexpr constructor, this constructor shall be a \tcode{constexpr} constructor.
2773+
If \tcode{T}'s constructor selected for the initialization is a constexpr constructor, this constructor shall be a constexpr constructor.
27742774
\end{itemdescr}
27752775

27762776
\pnum

0 commit comments

Comments
 (0)