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.

3 files changed, 4 insertions, 5 deletions

diff --git a/src/mongo/db/concurrency/fast_map_noalloc.h b/src/mongo/db/concurrency/fast_map_noalloc.h
index e08909b8439..b6fdcf0a7a3 100644
--- a/src/mongo/db/concurrency/fast_map_noalloc.h
+++ b/src/mongo/db/concurrency/fast_map_noalloc.h
@@ -29,7 +29,6 @@
 #pragma once
 
 #include "mongo/base/static_assert.h"
-#include "mongo/platform/unordered_map.h"
 #include "mongo/util/assert_util.h"
 
 namespace mongo {
diff --git a/src/mongo/db/concurrency/fast_map_noalloc_test.cpp b/src/mongo/db/concurrency/fast_map_noalloc_test.cpp
index d03d1d59fc1..a75d62f521e 100644
--- a/src/mongo/db/concurrency/fast_map_noalloc_test.cpp
+++ b/src/mongo/db/concurrency/fast_map_noalloc_test.cpp
@@ -147,7 +147,7 @@ TEST(FastMapNoAlloc, FindAndRemove) {
 
 TEST(FastMapNoAlloc, RemoveAll) {
     TestFastMapNoAlloc map;
-    unordered_map<ResourceId, TestStruct> checkMap;
+    stdx::unordered_map<ResourceId, TestStruct> checkMap;
 
     for (int i = 1; i <= 6; i++) {
         map.insert(ResourceId(RESOURCE_COLLECTION, i))
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;
     };