diff options
| author | ADAM David Alan Martin <adam.martin@10gen.com> | 2018-02-13 14:09:32 -0500 |
|---|---|---|
| committer | ADAM David Alan Martin <adam.martin@10gen.com> | 2018-02-14 15:57:45 -0500 |
| commit | 060e32706980ffc84aac250022d55f92afcffa69 (patch) | |
| tree | b179eee919fd60d08c0a1cfbef716b31a7db9925 /src/mongo/db/cursor_manager.h | |
| parent | 8b6a6266458cfd065cb0133a909bae856e417882 (diff) | |
| download | mongo-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/cursor_manager.h')
| -rw-r--r-- | src/mongo/db/cursor_manager.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mongo/db/cursor_manager.h b/src/mongo/db/cursor_manager.h index f8dcebb803d..90895407f53 100644 --- a/src/mongo/db/cursor_manager.h +++ b/src/mongo/db/cursor_manager.h @@ -39,8 +39,7 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/record_id.h" #include "mongo/db/session_killer.h" -#include "mongo/platform/unordered_map.h" -#include "mongo/platform/unordered_set.h" +#include "mongo/stdx/unordered_map.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/concurrency/mutex.h" #include "mongo/util/duration.h" @@ -80,7 +79,7 @@ class PlanExecutor; */ class CursorManager { public: - using RegistrationToken = Partitioned<unordered_set<PlanExecutor*>>::PartitionId; + using RegistrationToken = Partitioned<stdx::unordered_set<PlanExecutor*>>::PartitionId; /** * Appends the sessions that have open cursors on the global cursor manager and across @@ -143,7 +142,8 @@ public: * happens automatically for yielding PlanExecutors, so this should only be called by a * PlanExecutor itself. Returns a token that must be stored for use during deregistration. */ - Partitioned<unordered_set<PlanExecutor*>>::PartitionId registerExecutor(PlanExecutor* exec); + Partitioned<stdx::unordered_set<PlanExecutor*>>::PartitionId registerExecutor( + PlanExecutor* exec); /** * Remove an executor from the registry. It is legal to call this even if 'exec' is not @@ -296,8 +296,9 @@ private: // partition helpers to acquire mutexes for all partitions. mutable SimpleMutex _registrationLock; std::unique_ptr<PseudoRandom> _random; - Partitioned<unordered_set<PlanExecutor*>, kNumPartitions, PlanExecutorPartitioner> + Partitioned<stdx::unordered_set<PlanExecutor*>, kNumPartitions, PlanExecutorPartitioner> _registeredPlanExecutors; - std::unique_ptr<Partitioned<unordered_map<CursorId, ClientCursor*>, kNumPartitions>> _cursorMap; + std::unique_ptr<Partitioned<stdx::unordered_map<CursorId, ClientCursor*>, kNumPartitions>> + _cursorMap; }; } // namespace mongo |