diff options
| author | Henrik Nord <[email protected]> | 2015-10-27 12:55:25 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-10-27 12:55:25 +0100 |
| commit | 1d6f49bfc5222217579540bd13c47a02e61896a9 (patch) | |
| tree | 235b7e58fdfe6e99886c6367a5a23d7495aca0ec /erts/preloaded | |
| parent | 4b5853e7865d6a1baab39d7345b1b8d0280a4291 (diff) | |
| parent | 7dc9eefa341fbfae0ebc55a88b96a375c611e3a4 (diff) | |
| download | otp-1d6f49bfc5222217579540bd13c47a02e61896a9.tar.gz otp-1d6f49bfc5222217579540bd13c47a02e61896a9.tar.bz2 otp-1d6f49bfc5222217579540bd13c47a02e61896a9.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 4e55f711b2..7280b43502 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1974,6 +1974,7 @@ localtime_to_universaltime(_Localtime, _IsDst) -> %% CHECK! Why the strange very thorough specification of the error %% condition with disallowed arity in erl_bif_types? %% Not documented +%% Shadowed by erl_bif_types: erlang:make_fun/3 -spec erlang:make_fun(Module, Function, Arity) -> function() when Module :: atom(), Function :: atom(), |