diff options
| author | Anders Svensson <[email protected]> | 2015-03-05 01:34:08 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-05 01:34:08 +0100 |
| commit | 5e5b22215e3f0a60b7afc2393b3ef68892360b07 (patch) | |
| tree | 1c0a2c3b66c6af9eae4ba6587b911681a075ae64 /lib/diameter/src/base/diameter_sync.erl | |
| parent | a4df8f2e68ccef9936c5b43378a006099d81f801 (diff) | |
| parent | eae8ecd1fd2ba33b1c81d0c19605047e2f317eda (diff) | |
| download | otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.tar.gz otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.tar.bz2 otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.zip | |
Merge branch 'anders/diameter/time/OTP-12439' into maint
* anders/diameter/time/OTP-12439:
Use new time api in test suites
Use new time api in implementation
Diffstat (limited to 'lib/diameter/src/base/diameter_sync.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_sync.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_sync.erl b/lib/diameter/src/base/diameter_sync.erl index ce2db4b3a2..90eabece3d 100644 --- a/lib/diameter/src/base/diameter_sync.erl +++ b/lib/diameter/src/base/diameter_sync.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2011. All Rights Reserved. +%% Copyright Ericsson AB 2010-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -27,6 +27,9 @@ -module(diameter_sync). -behaviour(gen_server). +-compile({no_auto_import, [now/0]}). +-import(diameter_lib, [now/0]). + -export([call/4, call/5, cast/4, cast/5, carp/1, carp/2]). |