aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-11-27 11:47:38 +0100
committerSiri Hansen <[email protected]>2014-11-27 11:47:38 +0100
commitfc2067dc316e66e07c351254fbfb4a7edbaf6be4 (patch)
tree189a4e0a4739704a24c26567dbf8df80fa377cca /lib
parent048ee9e06afb36d1711b824d1786400b287256f0 (diff)
parent6d4fa3013653082f7ff6db6d75fb648b49de2d67 (diff)
downloadotp-fc2067dc316e66e07c351254fbfb4a7edbaf6be4.tar.gz
otp-fc2067dc316e66e07c351254fbfb4a7edbaf6be4.tar.bz2
otp-fc2067dc316e66e07c351254fbfb4a7edbaf6be4.zip
Merge branch 'siri/gen_server/try-catch/OTP-12263' into maint
* siri/gen_server/try-catch/OTP-12263: Add spec for gen_server:terminate/6,7
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/src/gen_server.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 528dd23e1c..18ef4a2507 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -778,8 +778,11 @@ print_event(Dev, Event, Name) ->
%%% Terminate the server.
%%% ---------------------------------------------------
+-spec terminate(_, _, _, _, _, _) -> no_return().
terminate(Reason, Name, Msg, Mod, State, Debug) ->
terminate(Reason, Reason, Name, Msg, Mod, State, Debug).
+
+-spec terminate(_, _, _, _, _, _, _) -> no_return().
terminate(ExitReason, ReportReason, Name, Msg, Mod, State, Debug) ->
Reply = try_terminate(Mod, ExitReason, State),
case Reply of