aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-11-28 10:39:59 +0100
committerSiri Hansen <[email protected]>2014-11-28 10:39:59 +0100
commit1a3b8025c61a82debd36739d2c6ab4102f4bb9a8 (patch)
treeee69dbbd55961a3bb1012ec4fbacad61f9e0bb01 /lib
parent5cacc9ad1bb94ccd3a1343a6c8ab01d134b2ff70 (diff)
parentfc2067dc316e66e07c351254fbfb4a7edbaf6be4 (diff)
downloadotp-1a3b8025c61a82debd36739d2c6ab4102f4bb9a8.tar.gz
otp-1a3b8025c61a82debd36739d2c6ab4102f4bb9a8.tar.bz2
otp-1a3b8025c61a82debd36739d2c6ab4102f4bb9a8.zip
Merge branch 'maint'
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 139bf35d27..b29e40e5f7 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -799,8 +799,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