diff options
| author | Erlang/OTP <[email protected]> | 2010-06-09 14:52:17 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-06-09 14:53:51 +0200 |
| commit | c90f8274fcc2f9d5fdd878f19dabbfea2024656f (patch) | |
| tree | 3af7df6e0c46efe0f9eb9d07c464c2a7e5da8178 /lib/compiler | |
| parent | c073122f207e71ebc02b31138b53bfd55a28ff44 (diff) | |
| parent | 144aa23315abc5954aa34e9df50617da735ed366 (diff) | |
| download | otp-c90f8274fcc2f9d5fdd878f19dabbfea2024656f.tar.gz otp-c90f8274fcc2f9d5fdd878f19dabbfea2024656f.tar.bz2 otp-c90f8274fcc2f9d5fdd878f19dabbfea2024656f.zip | |
Merge branch 'pan/otp_8683_compiler_warnings' into HEAD
* pan/otp_8683_compiler_warnings:
Remove (harmless) warning regarding auto-imported BIF max/2
Update primary bootstrap
Correct warnings and errors for auto-imported bif clashes
Conflicts:
bootstrap/lib/stdlib/ebin/erl_lint.beam
Diffstat (limited to 'lib/compiler')
| -rw-r--r-- | lib/compiler/src/rec_env.erl | 4 | ||||
| -rw-r--r-- | lib/compiler/test/error_SUITE.erl | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/compiler/src/rec_env.erl b/lib/compiler/src/rec_env.erl index 77005a6f9d..31a1f8b0b7 100644 --- a/lib/compiler/src/rec_env.erl +++ b/lib/compiler/src/rec_env.erl @@ -34,8 +34,6 @@ -export_type([environment/0]). --import(erlang, [max/2]). - -ifdef(DEBUG). -export([test/1, test_custom/1, test_custom/2]). -endif. @@ -588,7 +586,7 @@ new_key(N, R, _T, F, Env) -> new_key(generate(N, R1), R1, 0, F, Env). start_range(Env) -> - max(env_size(Env) * ?START_RANGE_FACTOR, ?MINIMUM_RANGE). + erlang:max(env_size(Env) * ?START_RANGE_FACTOR, ?MINIMUM_RANGE). %% The previous key might or might not be used to compute the next key %% to be tried. It is currently not used. diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl index 0874225a62..ec58a0761e 100644 --- a/lib/compiler/test/error_SUITE.erl +++ b/lib/compiler/test/error_SUITE.erl @@ -127,7 +127,7 @@ bif_clashes(Config) when is_list(Config) -> ">>, [], {error, - [{4,erl_lint,illegal_guard_expr}], + [{4,erl_lint,{illegal_guard_local_call,{length,1}}}], []} }], ?line [] = run2(Config, Ts3), Ts4 = [{bif_clashes9, @@ -140,7 +140,7 @@ bif_clashes(Config) when is_list(Config) -> ">>, [], {error, - [{5,erl_lint,illegal_guard_expr}], + [{5,erl_lint,{illegal_guard_local_call,{length,1}}}], []} }], ?line [] = run2(Config, Ts4), |