diff options
| author | Patrik Nyblom <[email protected]> | 2010-06-02 15:22:19 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-06-02 16:47:29 +0200 |
| commit | 1b8f86d8314389bf6033d23d3e6d707514ba7612 (patch) | |
| tree | ad57aabe4d838b11355de712c29d7599a0a05193 /lib/stdlib | |
| parent | 656e4790551b2211ff51c3ca24adbd07b135327e (diff) | |
| download | otp-1b8f86d8314389bf6033d23d3e6d707514ba7612.tar.gz otp-1b8f86d8314389bf6033d23d3e6d707514ba7612.tar.bz2 otp-1b8f86d8314389bf6033d23d3e6d707514ba7612.zip | |
Remove (harmless) warnings about min/max in core applications
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/src/file_sorter.erl | 9 | ||||
| -rw-r--r-- | lib/stdlib/src/lists.erl | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl index e21a0c88f3..3875eca39d 100644 --- a/lib/stdlib/src/file_sorter.erl +++ b/lib/stdlib/src/file_sorter.erl @@ -191,7 +191,7 @@ options([{format, Format} | L], Opts) when Format =:= binary; options([{format, binary_term} | L], Opts) -> options(L, Opts#opts{format = binary_term_fun()}); options([{size, Size} | L], Opts) when is_integer(Size), Size >= 0 -> - options(L, Opts#opts{size = max(Size, 1)}); + options(L, Opts#opts{size = erlang:max(Size, 1)}); options([{no_files, NoFiles} | L], Opts) when is_integer(NoFiles), NoFiles > 1 -> options(L, Opts#opts{no_files = NoFiles}); @@ -997,10 +997,10 @@ close_read_fun(Fd, FileName, fsort) -> file:delete(FileName). read_objs(Fd, FileName, I, L, Bin0, Size0, LSz, W) -> - Max = max(Size0, ?CHUNKSIZE), + Max = erlang:max(Size0, ?CHUNKSIZE), BSz0 = byte_size(Bin0), Min = Size0 - BSz0 + W#w.hdlen, % Min > 0 - NoBytes = max(Min, Max), + NoBytes = erlang:max(Min, Max), case read(Fd, FileName, NoBytes, W) of {ok, Bin} -> BSz = byte_size(Bin), @@ -1180,9 +1180,6 @@ make_key2([Kp], T) -> make_key2([Kp | Kps], T) -> [element(Kp, T) | make_key2(Kps, T)]. -max(A, B) when A < B -> B; -max(A, _) -> A. - infun(W) -> W1 = W#w{in = undefined}, try (W#w.in)(read) of diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl index 857eda8161..08ee595f4d 100644 --- a/lib/stdlib/src/lists.erl +++ b/lib/stdlib/src/lists.erl @@ -18,6 +18,9 @@ %% -module(lists). +-compile({no_auto_import,[max/2]}). +-compile({no_auto_import,[min/2]}). + -export([append/2, append/1, subtract/2, reverse/1, nth/2, nthtail/2, prefix/2, suffix/2, last/1, seq/2, seq/3, sum/1, duplicate/2, min/1, max/1, sublist/2, sublist/3, |