summaryrefslogtreecommitdiff
path: root/src/mongo/db
diff options
context:
space:
mode:
authorEric Milkie <milkie@10gen.com>2015-04-03 11:54:54 -0400
committerEric Milkie <milkie@10gen.com>2015-04-06 08:26:04 -0400
commit387e39a07522aec114a64146871eab2e015d7444 (patch)
tree3d2adc0a8467e021766b38fa77cd818c63a7e86f /src/mongo/db
parent9668b2dd7440adcd129ae395d57ea021b3623b01 (diff)
downloadmongo-387e39a07522aec114a64146871eab2e015d7444.tar.gz
SERVER-17880 Remove superfluous OpTime bson functionality
Diffstat (limited to 'src/mongo/db')
-rw-r--r--src/mongo/db/hasher_test.cpp2
-rw-r--r--src/mongo/db/json.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/hasher_test.cpp b/src/mongo/db/hasher_test.cpp
index 808370922ef..1d52e8815b0 100644
--- a/src/mongo/db/hasher_test.cpp
+++ b/src/mongo/db/hasher_test.cpp
@@ -345,7 +345,7 @@ namespace {
BSONObj o = BSON( "check" << Date_t( 0x5566778811223344LL ) );
ASSERT_EQUALS( hashIt( o ), 4476222765095560467LL );
- o = builder1.appendTimestamp( "check", 0x55667788LL * 1000LL, 0x11223344LL ).obj();
+ o = builder1.append( "check", OpTime(0x55667788LL, 0x11223344LL) ).obj();
ASSERT_EQUALS( hashIt( o ), 4873046866288452390LL );
o = BSON( "check" << Date_t( 0 ) );
diff --git a/src/mongo/db/json.cpp b/src/mongo/db/json.cpp
index f385630d833..6369ddfe50a 100644
--- a/src/mongo/db/json.cpp
+++ b/src/mongo/db/json.cpp
@@ -555,7 +555,7 @@ namespace mongo {
if (!readToken(RBRACE)) {
return parseError("Expecting '}'");
}
- builder.appendTimestamp(fieldName, (static_cast<uint64_t>(seconds))*1000, count);
+ builder.append(fieldName, OpTime(seconds, count));
return Status::OK();
}
@@ -815,7 +815,7 @@ namespace mongo {
if (!readToken(RPAREN)) {
return parseError("Expecting ')'");
}
- builder.appendTimestamp(fieldName, (static_cast<uint64_t>(seconds))*1000, count);
+ builder.append(fieldName, OpTime(seconds, count));
return Status::OK();
}