diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2016-05-09 16:27:06 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2016-05-17 11:11:57 -0400 |
| commit | 76de5323b88080f852ca4c2f42593502d26c5620 (patch) | |
| tree | ed2757f12d12670a25f29529c78b327bb308263d /src/mongo/executor/async_timer_asio.cpp | |
| parent | 73a042328a539b51b3bf35efc16ec3245381dc40 (diff) | |
| download | mongo-76de5323b88080f852ca4c2f42593502d26c5620.tar.gz | |
SERVER-24104 Replace stdx::duration with mongo::Duration.
The mongo::Duration type does overflow checking on casts and arithmetic.
This patch also moves DESTRUCTOR_GUARD out of assert_util.h into
destructor_guard.h in order to break an include cycle with duration.h.
Diffstat (limited to 'src/mongo/executor/async_timer_asio.cpp')
| -rw-r--r-- | src/mongo/executor/async_timer_asio.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/executor/async_timer_asio.cpp b/src/mongo/executor/async_timer_asio.cpp index 293ab3e137a..d8951d22d43 100644 --- a/src/mongo/executor/async_timer_asio.cpp +++ b/src/mongo/executor/async_timer_asio.cpp @@ -34,7 +34,7 @@ namespace mongo { namespace executor { AsyncTimerASIO::AsyncTimerASIO(asio::io_service::strand* strand, Milliseconds expiration) - : _strand(strand), _timer(_strand->get_io_service(), expiration) {} + : _strand(strand), _timer(_strand->get_io_service(), expiration.toSystemDuration()) {} void AsyncTimerASIO::cancel() { _timer.cancel(); |