diff options
| author | Rickard Green <[email protected]> | 2016-09-29 17:27:37 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-09-29 17:27:37 +0200 |
| commit | 4de2006a6fed05e6b524c56ad16b6e62a9d00817 (patch) | |
| tree | 6fbcf7a565a4b5159c118bae3775230e0418252a /lib/compiler | |
| parent | 830d1bf2e5acaad3c720a001ad338841993feacc (diff) | |
| parent | 5e57b3faccba1ae66ebd40fed23f5770eee71b04 (diff) | |
| download | otp-4de2006a6fed05e6b524c56ad16b6e62a9d00817.tar.gz otp-4de2006a6fed05e6b524c56ad16b6e62a9d00817.tar.bz2 otp-4de2006a6fed05e6b524c56ad16b6e62a9d00817.zip | |
Merge branch 'rickard/time-unit/OTP-13831'
* rickard/time-unit/OTP-13831:
Replace usage of deprecated time units
Diffstat (limited to 'lib/compiler')
| -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 16621d9b43..e4fb703939 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -360,7 +360,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 b205c7f50a..20195ac36f 100644 --- a/lib/compiler/src/compiler.app.src +++ b/lib/compiler/src/compiler.app.src @@ -72,5 +72,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"]}]}. |