diff options
| author | Siri Hansen <[email protected]> | 2011-11-30 11:37:56 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-11-30 11:37:56 +0100 |
| commit | 81f08713ff0ea3e49c2432e489a74f49ab6ebc42 (patch) | |
| tree | 7d69a9ec25fbab8a63741cc59f663b7b1c025280 /lib/stdlib/src | |
| parent | 8800c07a30b60ef450e2bac6dd920cccda7483ad (diff) | |
| parent | 3781b5129a3e43c1c2e5e33d1223e1e17a617be7 (diff) | |
| download | otp-81f08713ff0ea3e49c2432e489a74f49ab6ebc42.tar.gz otp-81f08713ff0ea3e49c2432e489a74f49ab6ebc42.tar.bz2 otp-81f08713ff0ea3e49c2432e489a74f49ab6ebc42.zip | |
Merge branch 'siri/stdlib/dialyzer-supervisor/OTP-9741'
* siri/stdlib/dialyzer-supervisor/OTP-9741:
Add test for upgrade of supervisor
Fix dialyzer warnings in supervisor
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/gen_server.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/src/supervisor.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl index 6f075bbe5a..af07bc988a 100644 --- a/lib/stdlib/src/gen_server.erl +++ b/lib/stdlib/src/gen_server.erl @@ -134,7 +134,7 @@ term(). -callback code_change(OldVsn :: (term() | {down, term()}), State :: term(), Extra :: term()) -> - {ok, NewState :: term()}. + {ok, NewState :: term()} | {error, Reason :: term()}. %%% ----------------------------------------------------------------- %%% Starts a generic server. diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl index 2dd5ccce7a..42ea42f42e 100644 --- a/lib/stdlib/src/supervisor.erl +++ b/lib/stdlib/src/supervisor.erl @@ -37,7 +37,7 @@ %%-------------------------------------------------------------------------- --type child() :: pid() | 'undefined'. +-type child() :: 'undefined' | pid() | [pid()]. -type child_id() :: term(). -type mfargs() :: {M :: module(), F :: atom(), A :: [term()] | undefined}. -type modules() :: [module()] | 'dynamic'. |