diff options
| author | Erlang/OTP <[email protected]> | 2015-08-13 12:34:03 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-08-13 12:34:03 +0200 |
| commit | 2c7132e3f6dc670a177aac804fe12702dbc9ed7d (patch) | |
| tree | f684c2a7881b2fb3eb44312df3770432de01b86d /lib/diameter/src/info | |
| parent | 0c21fb612b736f53dcc04face42bd106c50287ae (diff) | |
| parent | 96d63dca845e18f86488db9d8dfb33eb76ad0467 (diff) | |
| download | otp-2c7132e3f6dc670a177aac804fe12702dbc9ed7d.tar.gz otp-2c7132e3f6dc670a177aac804fe12702dbc9ed7d.tar.bz2 otp-2c7132e3f6dc670a177aac804fe12702dbc9ed7d.zip | |
Merge branch 'anders/diameter/17/time/OTP-12926' into maint-17
* anders/diameter/17/time/OTP-12926:
Simplify time manipulation
Remove use of monotonic time in pre-18 code
Remove unnecessary redefinition of erlang:max/2
Diffstat (limited to 'lib/diameter/src/info')
| -rw-r--r-- | lib/diameter/src/info/diameter_info.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/diameter/src/info/diameter_info.erl b/lib/diameter/src/info/diameter_info.erl index 10972f3231..5ecce2206f 100644 --- a/lib/diameter/src/info/diameter_info.erl +++ b/lib/diameter/src/info/diameter_info.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2014. All Rights Reserved. +%% Copyright Ericsson AB 2010-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -51,8 +51,6 @@ p/1, p/3]). --compile({no_auto_import,[max/2]}). - -export([collect/2]). -define(LONG_TIMEOUT, 30000). @@ -683,9 +681,6 @@ pt(T) -> recsplit(SFun, Rec) -> fun(Fs,Vs) -> SFun(element(1, Rec), Fs, Vs) end. -max(A, B) -> - if A > B -> A; true -> B end. - keyfetch(Key, List) -> {Key,V} = lists:keyfind(Key, 1, List), V. |