summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency/lock_manager.h
diff options
context:
space:
mode:
authorADAM David Alan Martin <adam.martin@10gen.com>2018-02-13 14:09:32 -0500
committerADAM David Alan Martin <adam.martin@10gen.com>2018-02-14 15:57:45 -0500
commit060e32706980ffc84aac250022d55f92afcffa69 (patch)
treeb179eee919fd60d08c0a1cfbef716b31a7db9925 /src/mongo/db/concurrency/lock_manager.h
parent8b6a6266458cfd065cb0133a909bae856e417882 (diff)
downloadmongo-060e32706980ffc84aac250022d55f92afcffa69.tar.gz
SERVER-33275 Remove `platform/unordered_`* headers
These headers date from before C++11 support and the `::mongo::stdx::` namespace. They can be removed and uses of the names therein can be changed to `::mongo::stdx::unordered_`* forms.
Diffstat (limited to 'src/mongo/db/concurrency/lock_manager.h')
-rw-r--r--src/mongo/db/concurrency/lock_manager.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/concurrency/lock_manager.h b/src/mongo/db/concurrency/lock_manager.h
index ec807345177..ae64a9c3398 100644
--- a/src/mongo/db/concurrency/lock_manager.h
+++ b/src/mongo/db/concurrency/lock_manager.h
@@ -39,9 +39,9 @@
#include "mongo/db/concurrency/lock_request_list.h"
#include "mongo/platform/atomic_word.h"
#include "mongo/platform/compiler.h"
-#include "mongo/platform/unordered_map.h"
#include "mongo/stdx/condition_variable.h"
#include "mongo/stdx/mutex.h"
+#include "mongo/stdx/unordered_map.h"
#include "mongo/util/concurrency/mutex.h"
namespace mongo {
@@ -142,7 +142,7 @@ private:
struct LockBucket {
SimpleMutex mutex;
- typedef unordered_map<ResourceId, LockHead*> Map;
+ typedef stdx::unordered_map<ResourceId, LockHead*> Map;
Map data;
LockHead* findOrInsert(ResourceId resId);
};
@@ -153,7 +153,7 @@ private:
struct Partition {
PartitionedLockHead* find(ResourceId resId);
PartitionedLockHead* findOrInsert(ResourceId resId);
- typedef unordered_map<ResourceId, PartitionedLockHead*> Map;
+ typedef stdx::unordered_map<ResourceId, PartitionedLockHead*> Map;
SimpleMutex mutex;
Map data;
};