summaryrefslogtreecommitdiff
path: root/src/mongo/db/cursor_manager.cpp
diff options
context:
space:
mode:
authorADAM David Alan Martin <adam.martin@10gen.com>2019-06-10 01:21:01 -0400
committerADAM David Alan Martin <adam.martin@10gen.com>2019-06-10 01:59:35 -0400
commitc36f9ecb91e49da7e637863889804fc4e6c6c05e (patch)
tree64d8aadb6d29042d4f4e7366bc1457e4e0612383 /src/mongo/db/cursor_manager.cpp
parentc9548e729c8fecd9d7a9a5dd341da0433194ac73 (diff)
downloadmongo-c36f9ecb91e49da7e637863889804fc4e6c6c05e.tar.gz
SERVER-39339 Remove `stdx/memory.h`
Diffstat (limited to 'src/mongo/db/cursor_manager.cpp')
-rw-r--r--src/mongo/db/cursor_manager.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mongo/db/cursor_manager.cpp b/src/mongo/db/cursor_manager.cpp
index 978245df357..d2daf732184 100644
--- a/src/mongo/db/cursor_manager.cpp
+++ b/src/mongo/db/cursor_manager.cpp
@@ -33,6 +33,8 @@
#include "mongo/db/cursor_manager.h"
+#include <memory>
+
#include "mongo/base/data_cursor.h"
#include "mongo/base/init.h"
#include "mongo/db/audit.h"
@@ -51,7 +53,6 @@
#include "mongo/db/query/plan_executor.h"
#include "mongo/db/service_context.h"
#include "mongo/platform/random.h"
-#include "mongo/stdx/memory.h"
#include "mongo/util/exit.h"
#include "mongo/util/log.h"
@@ -66,7 +67,7 @@ const auto serviceCursorManager =
ServiceContext::ConstructorActionRegisterer cursorManagerRegisterer{
"CursorManagerRegisterer", [](ServiceContext* svcCtx) {
- auto cursorManager = stdx::make_unique<CursorManager>();
+ auto cursorManager = std::make_unique<CursorManager>();
CursorManager::set(svcCtx, std::move(cursorManager));
}};
} // namespace
@@ -99,8 +100,8 @@ std::pair<Status, int> CursorManager::killCursorsWithMatchingSessions(
}
CursorManager::CursorManager()
- : _random(stdx::make_unique<PseudoRandom>(SecureRandom::create()->nextInt64())),
- _cursorMap(stdx::make_unique<Partitioned<stdx::unordered_map<CursorId, ClientCursor*>>>()) {}
+ : _random(std::make_unique<PseudoRandom>(SecureRandom::create()->nextInt64())),
+ _cursorMap(std::make_unique<Partitioned<stdx::unordered_map<CursorId, ClientCursor*>>>()) {}
CursorManager::~CursorManager() {
auto allPartitions = _cursorMap->lockAllPartitions();