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/db/range_deleter.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/db/range_deleter.cpp')
-rw-r--r-- | src/mongo/db/range_deleter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/range_deleter.cpp b/src/mongo/db/range_deleter.cpp index 2d9e9c04bd5..8d05a926991 100644 --- a/src/mongo/db/range_deleter.cpp +++ b/src/mongo/db/range_deleter.cpp @@ -423,7 +423,8 @@ void RangeDeleter::doWork() { { stdx::unique_lock<stdx::mutex> sl(_queueMutex); while (_taskQueue.empty()) { - _taskQueueNotEmptyCV.wait_for(sl, Milliseconds(kNotEmptyTimeoutMillis)); + _taskQueueNotEmptyCV.wait_for( + sl, Milliseconds(kNotEmptyTimeoutMillis).toSystemDuration()); if (stopRequested()) { log() << "stopping range deleter worker" << endl; |