diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-25 12:55:19 +0100 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-03-25 12:55:19 +0100 |
| commit | d6797e9a34df677e82db5ee8b8388fbdf57f09f5 (patch) | |
| tree | 1229a0acce281d4185d1ffcea44569947c31009c /lib/inets/src/inets_app/inets_lib.erl | |
| parent | a206e66f13471cdad02a966fcb569673e0938fa4 (diff) | |
| parent | e10385909c687590d6522d007bba9d72f3f5c380 (diff) | |
| download | otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.tar.gz otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.tar.bz2 otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.zip | |
Merge branch 'erland/OTP18/inets/time_api/OTP-12441'
* erland/OTP18/inets/time_api/OTP-12441:
inets: Add new module inets_time_compat with new time API The new module is backwards compatible.
Diffstat (limited to 'lib/inets/src/inets_app/inets_lib.erl')
| -rw-r--r-- | lib/inets/src/inets_app/inets_lib.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/inets_lib.erl b/lib/inets/src/inets_app/inets_lib.erl index 11d3bac6bb..e79959f678 100644 --- a/lib/inets/src/inets_app/inets_lib.erl +++ b/lib/inets/src/inets_app/inets_lib.erl @@ -18,7 +18,6 @@ %% -module(inets_lib). --compile([{nowarn_deprecated_function,{erlang,now,0}}]). -export([millisec_passed/1, formated_timestamp/0, format_timestamp/1]). @@ -27,7 +26,7 @@ %% Help function, elapsed milliseconds since T0 millisec_passed({_,_,_} = T0 ) -> %% OTP 17 and earlier - timer:now_diff(erlang:now(), T0) div 1000; + timer:now_diff(inets_time_compat:monotonic_time(), T0) div 1000; millisec_passed(T0) -> %% OTP 18 |