Skip to content

Commit c4d91ab

Browse files
committed
[basic.start,except] Harmonize references to std::terminate
1 parent fbd725c commit c4d91ab

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

source/basic.tex

+2-2
Original file line numberDiff line numberDiff line change
@@ -5487,7 +5487,7 @@
54875487
\pnum
54885488
If the initialization of a non-local variable with static or thread storage duration
54895489
exits via
5490-
an exception, \tcode{std::terminate} is called\iref{except.terminate}.%
5490+
an exception, \tcode{std::terminate()} is called\iref{except.terminate}.%
54915491
\indextext{program!start|)}
54925492

54935493
\rSec3[basic.start.term]{Termination}
@@ -5533,7 +5533,7 @@
55335533
of the subobjects is destroyed.
55345534
If the destruction of an object with static or thread storage duration
55355535
exits via an exception,
5536-
\tcode{std::terminate} is called\iref{except.terminate}.
5536+
\tcode{std::terminate()} is called\iref{except.terminate}.
55375537

55385538
\pnum
55395539
If a function contains a block-scope object of static or thread storage duration that has been

source/exceptions.tex

+13-13
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@
592592
The stack will have been unwound at that point.
593593
\end{note}
594594
Also, an implicit handler is considered active when
595-
\tcode{std::terminate()}
595+
\tcode{std::terminate}
596596
is entered due to a throw. A handler is no longer considered active when the
597597
catch clause exits.
598598

@@ -605,12 +605,12 @@
605605
\pnum
606606
If no matching handler is found,
607607
the function
608-
\tcode{std::terminate()}
608+
\tcode{std::terminate}
609609
is called;
610610
whether or not the stack is unwound before this call to
611-
\tcode{std::terminate()}
611+
\tcode{std::terminate}
612612
is \impldef{stack unwinding before call to
613-
\tcode{std::terminate()}}\iref{except.terminate}.
613+
\tcode{std::terminate}}\iref{except.terminate}.
614614

615615
\pnum
616616
Referring to any non-static member or base class of an object
@@ -787,7 +787,7 @@
787787
and the search for a handler\iref{except.handle}
788788
encounters the outermost block of a function with a
789789
non-throwing exception specification,
790-
the function \tcode{std::terminate()} is called\iref{except.terminate}.
790+
the function \tcode{std::terminate} is called\iref{except.terminate}.
791791
\begin{note}
792792
An implementation shall not reject an expression merely because, when
793793
executed, it throws or might
@@ -874,7 +874,7 @@
874874
their exception specifications do not contribute
875875
to the exception specification of the constructor,
876876
because an exception thrown from such a destructor
877-
would call \tcode{std::terminate}
877+
would call \tcode{std::terminate()}
878878
rather than escape the constructor~(\ref{except.throw}, \ref{except.terminate}).
879879
\end{note}
880880

@@ -978,15 +978,15 @@
978978
\rSec1[except.special]{Special functions}
979979

980980
\pnum
981-
The function \tcode{std::terminate()}\iref{except.terminate}
981+
The function \tcode{std::terminate}\iref{except.terminate}
982982
is used by the exception
983983
handling mechanism for coping with errors related to the exception handling
984984
mechanism itself. The function
985985
\tcode{std::current_exception()}\iref{propagation} and the class
986986
\tcode{std::nested_exception}\iref{except.nested} can be used by a program to
987987
capture the currently handled exception.
988988

989-
\rSec2[except.terminate]{The \tcode{std::terminate()} function}
989+
\rSec2[except.terminate]{The \tcode{std::terminate} function}
990990

991991
\pnum
992992
\indextext{\idxcode{terminate}}%
@@ -1065,13 +1065,13 @@
10651065
\pnum
10661066
\indextext{\idxcode{terminate}}%
10671067
In such cases,
1068-
\tcode{std::terminate()}
1068+
\tcode{std::terminate}
10691069
is called\iref{exception.terminate}.
10701070
In the situation where no matching handler is found, it is
1071-
\impldef{stack unwinding before call to \tcode{std::terminate()}} whether or not the
1071+
\impldef{stack unwinding before call to \tcode{std::terminate}} whether or not the
10721072
stack is unwound
10731073
before
1074-
\tcode{std::terminate()}
1074+
\tcode{std::terminate}
10751075
is called.
10761076
In the situation where the search for a handler\iref{except.handle} encounters the
10771077
outermost block of a function
@@ -1082,12 +1082,12 @@
10821082
whether the stack is unwound, unwound partially, or not unwound at all
10831083
before \tcode{std::terminate()} is called.
10841084
In all other situations, the stack shall not be unwound before
1085-
\tcode{std::terminate()}
1085+
\tcode{std::terminate}
10861086
is called.
10871087
An implementation is not permitted to finish stack unwinding
10881088
prematurely based on a determination that the unwind process
10891089
will eventually cause a call to
1090-
\tcode{std::terminate()}.
1090+
\tcode{std::terminate}.
10911091

10921092
\rSec2[except.uncaught]{The \tcode{std::uncaught_exceptions()} function}%
10931093
\indexlibrary{\idxcode{uncaught_exceptions}}

0 commit comments

Comments
 (0)