diff options
| author | Rickard Green <[email protected]> | 2016-08-24 15:57:53 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-25 17:37:44 +0200 |
| commit | 5e57b3faccba1ae66ebd40fed23f5770eee71b04 (patch) | |
| tree | b7eb1632247fa179bd852177f4c02980d5571a6a /lib/compiler/src | |
| parent | fc85e401ee279cc3b69635a71ffa93544ce5b99d (diff) | |
| download | otp-5e57b3faccba1ae66ebd40fed23f5770eee71b04.tar.gz otp-5e57b3faccba1ae66ebd40fed23f5770eee71b04.tar.bz2 otp-5e57b3faccba1ae66ebd40fed23f5770eee71b04.zip | |
Replace usage of deprecated time units
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/compile.erl | 2 | ||||
| -rw-r--r-- | lib/compiler/src/compiler.app.src | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index 82ff8a95f3..a7b01df535 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -354,7 +354,7 @@ run_tc({Name,Fun}, St) -> T1 = erlang:monotonic_time(), Val = (catch Fun(St)), T2 = erlang:monotonic_time(), - Elapsed = erlang:convert_time_unit(T2 - T1, native, milli_seconds), + Elapsed = erlang:convert_time_unit(T2 - T1, native, millisecond), Mem0 = erts_debug:flat_size(Val)*erlang:system_info(wordsize), Mem = lists:flatten(io_lib:format("~.1f kB", [Mem0/1024])), io:format(" ~-30s: ~10.3f s ~12s\n", diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src index 1fd7800e85..32fd642015 100644 --- a/lib/compiler/src/compiler.app.src +++ b/lib/compiler/src/compiler.app.src @@ -73,5 +73,5 @@ {registered, []}, {applications, [kernel, stdlib]}, {env, []}, - {runtime_dependencies, ["stdlib-2.5","kernel-4.0","hipe-3.12","erts-7.0", + {runtime_dependencies, ["stdlib-2.5","kernel-4.0","hipe-3.12","erts-9.0", "crypto-3.6"]}]}. |