Skip to content

Commit 0ba172e

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 2dc8074 commit 0ba172e

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
@@ -1033,9 +1033,10 @@
10331033

10341034
\pnum
10351035
\indextext{\idxcode{terminate}}%
1036-
% FIXME: What does it mean to abandon exception handling?
1037-
In some situations, exception handling is abandoned
1038-
for less subtle error handling techniques.
1036+
Some errors in a program cannot be recovered from, such as when an exception
1037+
is not handled or a \tcode{std::thread} object is destroyed while its thread
1038+
function is still running. In such cases,
1039+
the function \tcode{std::terminate}\iref{exception.terminate} is invoked.
10391040
\begin{note}
10401041
These situations are:
10411042
\indextext{\idxcode{terminate}!called}%
@@ -1129,8 +1130,6 @@
11291130

11301131
\pnum
11311132
\indextext{\idxcode{terminate}}%
1132-
In such cases,
1133-
the function \tcode{std::terminate} is invoked\iref{exception.terminate}.
11341133
In the situation where no matching handler is found, it is
11351134
\impldef{stack unwinding before invocation of \tcode{std::terminate}}
11361135
whether or not the stack is unwound

0 commit comments

Comments
 (0)