summaryrefslogtreecommitdiff
path: root/src/mongo/bson/oid.cpp
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@10gen.com>2012-06-05 17:34:43 -0400
committerAndy Schwerin <schwerin@10gen.com>2012-06-06 23:28:19 -0400
commit9bb422bbce703da9913d807123480f00908de075 (patch)
tree16bcaa46c5a8793965f06e8aa768a148b686c5b5 /src/mongo/bson/oid.cpp
parent1c3be5814406e3a03afc8cbdaa3ebe8814013271 (diff)
downloadmongo-9bb422bbce703da9913d807123480f00908de075.tar.gz
SERVER-5648 Replace old implementation of AtomicUInt64 with new one.
Diffstat (limited to 'src/mongo/bson/oid.cpp')
-rw-r--r--src/mongo/bson/oid.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/bson/oid.cpp b/src/mongo/bson/oid.cpp
index 4f25fef6085..15bc15f6502 100644
--- a/src/mongo/bson/oid.cpp
+++ b/src/mongo/bson/oid.cpp
@@ -19,7 +19,7 @@
#include <boost/functional/hash.hpp>
-#include "mongo/platform/atomic_uint64.h"
+#include "mongo/platform/atomic_word.h"
#include "mongo/bson/bsonobjbuilder.h"
#include "mongo/bson/oid.h"
#include "mongo/bson/util/atomic_int.h"
@@ -136,8 +136,8 @@ namespace mongo {
}
}
+ static AtomicUInt64 _initSequential_sequence;
void OID::initSequential() {
- static AtomicUInt64 sequence;
{
unsigned t = (unsigned) time(0);
@@ -149,7 +149,7 @@ namespace mongo {
}
{
- unsigned long long nextNumber = sequence.fetchAndAdd();
+ unsigned long long nextNumber = _initSequential_sequence.fetchAndAdd(1);
unsigned char* numberData = reinterpret_cast<unsigned char*>(&nextNumber);
for ( int i=0; i<8; i++ ) {
data[4+i] = numberData[7-i];