diff options
| author | Anders Svensson <[email protected]> | 2015-08-13 17:08:15 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-08-13 23:01:28 +0200 |
| commit | 8c5d719afaeae0c9cfa1079c0de5452f8bdc837b (patch) | |
| tree | c886baae9730405c7dafac7549e9a1246aac686a /lib/diameter/src/info/diameter_info.erl | |
| parent | c972a98fe58569d661e9bfad5512bcdb498f6200 (diff) | |
| parent | 155c22ff3ce3f667d4a984bd6648f029e0998381 (diff) | |
| download | otp-8c5d719afaeae0c9cfa1079c0de5452f8bdc837b.tar.gz otp-8c5d719afaeae0c9cfa1079c0de5452f8bdc837b.tar.bz2 otp-8c5d719afaeae0c9cfa1079c0de5452f8bdc837b.zip | |
Merge branch 'maint-17' into maint
The diffs are all about adapting to the OTP 18 time interface. The code
was previously backwards compatible, falling back on the erlang:now/0 if
erlang:monotonic_time/0 is unavailable, but this was seen to be a bad
thing in commit 9c0f2f2c. Use of erlang:now/0 is now removed.
Diffstat (limited to 'lib/diameter/src/info/diameter_info.erl')
| -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 2e08662a9e..59a3b94ee4 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. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -52,8 +52,6 @@ p/1, p/3]). --compile({no_auto_import,[max/2]}). - -export([collect/2]). -define(LONG_TIMEOUT, 30000). @@ -684,9 +682,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. |