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/hipe | |
| 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/hipe')
| -rw-r--r-- | lib/hipe/main/hipe.app.src | 2 | ||||
| -rw-r--r-- | lib/hipe/tools/hipe_timer.erl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/hipe/main/hipe.app.src b/lib/hipe/main/hipe.app.src index 96bcf7d7e8..af2c02006d 100644 --- a/lib/hipe/main/hipe.app.src +++ b/lib/hipe/main/hipe.app.src @@ -232,4 +232,4 @@ {applications, [kernel,stdlib]}, {env, []}, {runtime_dependencies, ["syntax_tools-1.6.14","stdlib-2.5","kernel-3.0", - "erts-7.1","compiler-5.0"]}]}. + "erts-9.0","compiler-5.0"]}]}. diff --git a/lib/hipe/tools/hipe_timer.erl b/lib/hipe/tools/hipe_timer.erl index 72aa25d440..90bd0bb81f 100644 --- a/lib/hipe/tools/hipe_timer.erl +++ b/lib/hipe/tools/hipe_timer.erl @@ -51,7 +51,7 @@ empty_time() -> {A,_} = erlang:statistics(runtime), WTB = erlang:monotonic_time(), {B,_} = erlang:statistics(runtime), - {(WTB-WTA)/erlang:convert_time_unit(1, seconds, native),B-A}. + {(WTB-WTA)/erlang:convert_time_unit(1, second, native),B-A}. time(F) -> WTA = erlang:monotonic_time(), @@ -59,7 +59,7 @@ time(F) -> F(), WTB = erlang:monotonic_time(), {B,_} = erlang:statistics(runtime), - {(WTB-WTA)/erlang:convert_time_unit(1, seconds, native),B-A}. + {(WTB-WTA)/erlang:convert_time_unit(1, second, native),B-A}. timer(F) -> WTA = erlang:monotonic_time(), @@ -67,7 +67,7 @@ timer(F) -> R = F(), WTB = erlang:monotonic_time(), {B,_} = erlang:statistics(runtime), - {R,{(WTB-WTA)/erlang:convert_time_unit(1, seconds, native),B-A}}. + {R,{(WTB-WTA)/erlang:convert_time_unit(1, second, native),B-A}}. advanced(_Fun, I) when I < 2 -> false; advanced(Fun, Iterations) -> |