diff options
| author | Hans Bolinder <[email protected]> | 2011-08-16 13:35:28 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2011-08-16 13:35:28 +0200 |
| commit | f74168772f6eb7765d8cfe0ffcce58273f920bcf (patch) | |
| tree | 05dd64f788a85ac2838fa0e994b735891d7595bd /lib | |
| parent | 90fb6ccf9292c909a0639f3874b36a1805204bc8 (diff) | |
| parent | 79dbe6c9834fa21f37a169ca981a427e230aa49c (diff) | |
| download | otp-f74168772f6eb7765d8cfe0ffcce58273f920bcf.tar.gz otp-f74168772f6eb7765d8cfe0ffcce58273f920bcf.tar.bz2 otp-f74168772f6eb7765d8cfe0ffcce58273f920bcf.zip | |
Merge branch 'hb/stdlib/contract_correction/OTP-9450' into dev
* hb/stdlib/contract_correction/OTP-9450:
Correct the contract of timer:now_diff/2
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/timer.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl index e3d6c905b6..689e42051f 100644 --- a/lib/stdlib/src/timer.erl +++ b/lib/stdlib/src/timer.erl @@ -199,7 +199,7 @@ tc(M, F, A) -> %% Calculate the time difference (in microseconds) of two %% erlang:now() timestamps, T2-T1. %% --spec now_diff(T1, T2) -> Tdiff when +-spec now_diff(T2, T1) -> Tdiff when T1 :: erlang:timestamp(), T2 :: erlang:timestamp(), Tdiff :: integer(). |