diff options
| author | Henrik Nord <[email protected]> | 2011-10-07 17:17:27 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-10-07 17:17:32 +0200 |
| commit | a5abe96590ec22779f796fc67e5afbbf99a3a922 (patch) | |
| tree | b22eb07f52606bc7ab5c7339026d007784aef0a4 /lib/stdlib/src/supervisor_bridge.erl | |
| parent | 00202339445daae6ed931f28f932089d5c3dd455 (diff) | |
| parent | ed72d05e27fcf1d4f649014ffd7a1c2878b5b010 (diff) | |
| download | otp-a5abe96590ec22779f796fc67e5afbbf99a3a922.tar.gz otp-a5abe96590ec22779f796fc67e5afbbf99a3a922.tar.bz2 otp-a5abe96590ec22779f796fc67e5afbbf99a3a922.zip | |
Merge branch 'sa/callback-attr'
* sa/callback-attr:
Add callback specs into 'application' module in kernel
Add callback specs to tftp module following internet documentation
Add callback specs to inets_service module following possibly deprecated comments
Add '-callback' attributes in stdlib's behaviours
Update primary bootstrap
Update the documentation with information on the callback attribute
Automatically generate 'behaviour_info' function from '-callback' attributes
Add '-callback' attribute to language syntax
OTP-9621
Diffstat (limited to 'lib/stdlib/src/supervisor_bridge.erl')
| -rw-r--r-- | lib/stdlib/src/supervisor_bridge.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/stdlib/src/supervisor_bridge.erl b/lib/stdlib/src/supervisor_bridge.erl index 555cb5a66f..e8405ab9a4 100644 --- a/lib/stdlib/src/supervisor_bridge.erl +++ b/lib/stdlib/src/supervisor_bridge.erl @@ -22,15 +22,14 @@ %% External exports -export([start_link/2, start_link/3]). --export([behaviour_info/1]). %% Internal exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2]). -export([code_change/3]). -behaviour_info(callbacks) -> - [{init,1},{terminate,2}]; -behaviour_info(_Other) -> - undefined. +-callback init(Args :: term()) -> + {ok, Pid :: pid(), State :: term()} | ignore | {error, Error :: term()}. +-callback terminate(Reason :: (shutdown | term()), State :: term()) -> + Ignored :: term(). %%%----------------------------------------------------------------- %%% This is a rewrite of supervisor_bridge from BS.3. |