diff options
| author | Hans Bolinder <[email protected]> | 2011-06-20 16:33:46 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2011-06-20 16:33:46 +0200 |
| commit | b9d8ae5aa52774ed0ce12c9d21ad7f3670c2dca1 (patch) | |
| tree | 66d6fe3c4dcb15d447944c2054059c423a0d88b7 /lib/stdlib/src/timer.erl | |
| parent | 9b9dc0d0c6aa9dc002c6581eb76b891e707a492a (diff) | |
| parent | 4bd8ab6298961d564c34172c0a4d74cd08a08249 (diff) | |
| download | otp-b9d8ae5aa52774ed0ce12c9d21ad7f3670c2dca1.tar.gz otp-b9d8ae5aa52774ed0ce12c9d21ad7f3670c2dca1.tar.bz2 otp-b9d8ae5aa52774ed0ce12c9d21ad7f3670c2dca1.zip | |
Merge branch 'hb/specs_and_types/OTP-9356' into dev
* hb/specs_and_types/OTP-9356:
Add more specs and types
Diffstat (limited to 'lib/stdlib/src/timer.erl')
| -rw-r--r-- | lib/stdlib/src/timer.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl index 89fae05e4f..e3d6c905b6 100644 --- a/lib/stdlib/src/timer.erl +++ b/lib/stdlib/src/timer.erl @@ -200,8 +200,8 @@ tc(M, F, A) -> %% erlang:now() timestamps, T2-T1. %% -spec now_diff(T1, T2) -> Tdiff when - T1 :: calendar:t_now(), - T2 :: calendar:t_now(), + T1 :: erlang:timestamp(), + T2 :: erlang:timestamp(), Tdiff :: integer(). now_diff({A2, B2, C2}, {A1, B1, C1}) -> ((A2-A1)*1000000 + B2-B1)*1000000 + C2-C1. |