diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
| commit | 502ed5fd6bd36328d6be63c68ee2a56738ced058 (patch) | |
| tree | 80cfb83dd63ffa876541740cc067ea05bb39118d /lib/stdlib/src/timer.erl | |
| parent | cf102c1b1225450e7918a6119b7d949eb7e575c4 (diff) | |
| parent | 0bac72a18e8a5f6a46baae9c9ac73bde32948ff6 (diff) | |
| download | otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.gz otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.bz2 otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.zip | |
Merge branch 'master' into sverker/master/load_nif-print-init-error
Diffstat (limited to 'lib/stdlib/src/timer.erl')
| -rw-r--r-- | lib/stdlib/src/timer.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl index ca868627a9..df10790ea0 100644 --- a/lib/stdlib/src/timer.erl +++ b/lib/stdlib/src/timer.erl @@ -165,7 +165,7 @@ tc(F) -> T1 = erlang:monotonic_time(), Val = F(), T2 = erlang:monotonic_time(), - Time = erlang:convert_time_unit(T2 - T1, native, micro_seconds), + Time = erlang:convert_time_unit(T2 - T1, native, microsecond), {Time, Val}. %% @@ -180,7 +180,7 @@ tc(F, A) -> T1 = erlang:monotonic_time(), Val = apply(F, A), T2 = erlang:monotonic_time(), - Time = erlang:convert_time_unit(T2 - T1, native, micro_seconds), + Time = erlang:convert_time_unit(T2 - T1, native, microsecond), {Time, Val}. %% @@ -196,7 +196,7 @@ tc(M, F, A) -> T1 = erlang:monotonic_time(), Val = apply(M, F, A), T2 = erlang:monotonic_time(), - Time = erlang:convert_time_unit(T2 - T1, native, micro_seconds), + Time = erlang:convert_time_unit(T2 - T1, native, microsecond), {Time, Val}. %% |