Skip to content

Commit 94a4ad6

Browse files
committed
[except.terminate] Better describe the function
While 'std:terminate' was originally conceived as the way to report failures in the exception handling machinery, it has evolved to become a more general tool for reporting unrecoverable failures in the C++ runtime. This rewording attempts to address that evolving design, and in doing so addresses the outstanding %FIXME% that the current text is not adequately descriptive in the first place.
1 parent 70954ed commit 94a4ad6

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

source/exceptions.tex

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,9 +1016,10 @@
10161016

10171017
\pnum
10181018
\indextext{\idxcode{terminate}}%
1019-
% FIXME: What does it mean to abandon exception handling?
1020-
In some situations, exception handling is abandoned
1021-
for less subtle error handling techniques.
1019+
In some situations the \Cpp{} runtime encounters an error that cannot be
1020+
recovered from, such as when an exception is not handled, or a thread is
1021+
destroyed while still running. In such cases,
1022+
the function \tcode{std::terminate} is invoked\iref{exception.terminate}.
10221023
\begin{note}
10231024
These situations are:
10241025
\indextext{\idxcode{terminate}!called}%
@@ -1112,8 +1113,6 @@
11121113

11131114
\pnum
11141115
\indextext{\idxcode{terminate}}%
1115-
In such cases,
1116-
the function \tcode{std::terminate} is invoked\iref{exception.terminate}.
11171116
In the situation where no matching handler is found, it is
11181117
\impldef{stack unwinding before invocation of \tcode{std::terminate}}
11191118
whether or not the stack is unwound

0 commit comments

Comments
 (0)