diff options
| author | Hans Bolinder <[email protected]> | 2014-04-28 12:05:38 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2014-04-28 12:05:38 +0200 |
| commit | 683a293321b42ff6159637b2e0171c397db9a872 (patch) | |
| tree | b7414677fed503f2db33adbc47b1cb44a8e6f23b /lib/stdlib/src/gen_event.erl | |
| parent | 3be1dc100140139b2542cd327cf4f8453d43aca1 (diff) | |
| parent | eafe7f889a4ff60d9e3155518bda095740efe143 (diff) | |
| download | otp-683a293321b42ff6159637b2e0171c397db9a872.tar.gz otp-683a293321b42ff6159637b2e0171c397db9a872.tar.bz2 otp-683a293321b42ff6159637b2e0171c397db9a872.zip | |
Merge branch 'hb/optional_callbacks/OTP-11861'
* hb/optional_callbacks/OTP-11861:
[edoc] Handle optional behaviour callbacks
[syntax_tools] Let erl_syntax:concrete() accept the F/A syntax
Introduce the attribute -optional_callbacks in the context of behaviours
Diffstat (limited to 'lib/stdlib/src/gen_event.erl')
| -rw-r--r-- | lib/stdlib/src/gen_event.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl index d39dd89d3a..bb0ff46268 100644 --- a/lib/stdlib/src/gen_event.erl +++ b/lib/stdlib/src/gen_event.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -101,6 +101,14 @@ -callback code_change(OldVsn :: (term() | {down, term()}), State :: term(), Extra :: term()) -> {ok, NewState :: term()}. +-callback format_status(Opt, StatusData) -> Status when + Opt :: 'normal' | 'terminate', + StatusData :: [PDict | State], + PDict :: [{Key :: term(), Value :: term()}], + State :: term(), + Status :: term(). + +-optional_callbacks([format_status/2]). %%--------------------------------------------------------------------------- |