diff options
| author | Sverker Eriksson <[email protected]> | 2016-05-31 11:53:32 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-05-31 11:53:32 +0200 |
| commit | 0e40609c64538a58466de8cddf2a7f0aebaf65ef (patch) | |
| tree | c209d18d6a6fcfb9d292b42fc57405bd1ecea474 /erts/preloaded/src/erlang.erl | |
| parent | 8305c497ffff7ccf7cb06635a18c84b3eb3c859f (diff) | |
| parent | d319179eee6a523812c81c7ca49afb670de0b277 (diff) | |
| download | otp-0e40609c64538a58466de8cddf2a7f0aebaf65ef.tar.gz otp-0e40609c64538a58466de8cddf2a7f0aebaf65ef.tar.bz2 otp-0e40609c64538a58466de8cddf2a7f0aebaf65ef.zip | |
Merge branch 'sverker/dialyzer/erlang-halt'
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 5283519c0a..94f3078173 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -977,11 +977,13 @@ group_leader(_GroupLeader, _Pid) -> erlang:nif_error(undefined). %% halt/0 +%% Shadowed by erl_bif_types: erlang:halt/0 -spec halt() -> no_return(). halt() -> erlang:halt(0, []). %% halt/1 +%% Shadowed by erl_bif_types: erlang:halt/1 -spec halt(Status) -> no_return() when Status :: non_neg_integer() | 'abort' | string(). halt(Status) -> @@ -2576,6 +2578,7 @@ universaltime_to_localtime(_Universaltime) -> %%-------------------------------------------------------------------------- +%% Shadowed by erl_bif_types: erlang:apply/2 -spec apply(Fun, Args) -> term() when Fun :: function(), Args :: [term()]. |