summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/jsobjtests.cpp
diff options
context:
space:
mode:
authorDwight <dwight@10gen.com>2012-02-28 17:28:49 -0500
committerDwight <dwight@10gen.com>2012-02-28 17:28:49 -0500
commitebeba7866b46a438877f25dc16d878f8d708c3eb (patch)
tree4a6f7cddb93f00f0f1867fb1b0b6d1e64bc6cb4b /src/mongo/dbtests/jsobjtests.cpp
parent95b58dea790f1cc7e7d5bb0e93c5ff5986bfbeec (diff)
downloadmongo-ebeba7866b46a438877f25dc16d878f8d708c3eb.tar.gz
SERVER-4328 use a mutex of its own for OpTime::now. we stay in the mutex for a while after grabbing an optime so that we dont have to reason too much about different threads grabbing optimes and then using them out of order.
Diffstat (limited to 'src/mongo/dbtests/jsobjtests.cpp')
-rw-r--r--src/mongo/dbtests/jsobjtests.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp
index 586a11745ab..47171b7c993 100644
--- a/src/mongo/dbtests/jsobjtests.cpp
+++ b/src/mongo/dbtests/jsobjtests.cpp
@@ -314,9 +314,9 @@ namespace JsobjTests {
e = i.next();
ASSERT( e.eoo() );
- OpTime before = OpTime::now();
+ OpTime before = OpTime::_now();
BSONElementManipulator( o.firstElement() ).initTimestamp();
- OpTime after = OpTime::now();
+ OpTime after = OpTime::_now();
OpTime test = OpTime( o.firstElement().date() );
ASSERT( before < test && test < after );