diff options
author | ADAM David Alan Martin <adam.martin@10gen.com> | 2019-06-10 01:21:01 -0400 |
---|---|---|
committer | ADAM David Alan Martin <adam.martin@10gen.com> | 2019-06-10 01:59:35 -0400 |
commit | c36f9ecb91e49da7e637863889804fc4e6c6c05e (patch) | |
tree | 64d8aadb6d29042d4f4e7366bc1457e4e0612383 /src/mongo/transport/service_state_machine_test.cpp | |
parent | c9548e729c8fecd9d7a9a5dd341da0433194ac73 (diff) | |
download | mongo-c36f9ecb91e49da7e637863889804fc4e6c6c05e.tar.gz |
SERVER-39339 Remove `stdx/memory.h`
Diffstat (limited to 'src/mongo/transport/service_state_machine_test.cpp')
-rw-r--r-- | src/mongo/transport/service_state_machine_test.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mongo/transport/service_state_machine_test.cpp b/src/mongo/transport/service_state_machine_test.cpp index 12f9120074a..c132d39d548 100644 --- a/src/mongo/transport/service_state_machine_test.cpp +++ b/src/mongo/transport/service_state_machine_test.cpp @@ -31,6 +31,8 @@ #include "mongo/platform/basic.h" +#include <memory> + #include "mongo/base/checked_cast.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" @@ -38,7 +40,6 @@ #include "mongo/db/dbmessage.h" #include "mongo/db/service_context.h" #include "mongo/rpc/op_msg.h" -#include "mongo/stdx/memory.h" #include "mongo/transport/mock_session.h" #include "mongo/transport/service_entry_point.h" #include "mongo/transport/service_executor.h" @@ -296,18 +297,18 @@ protected: auto sc = scOwned.get(); setGlobalServiceContext(std::move(scOwned)); - sc->setTickSource(stdx::make_unique<TickSourceMock<>>()); - sc->setFastClockSource(stdx::make_unique<ClockSourceMock>()); + sc->setTickSource(std::make_unique<TickSourceMock<>>()); + sc->setFastClockSource(std::make_unique<ClockSourceMock>()); - auto sep = stdx::make_unique<MockSEP>(); + auto sep = std::make_unique<MockSEP>(); _sep = sep.get(); sc->setServiceEntryPoint(std::move(sep)); - auto se = stdx::make_unique<MockServiceExecutor>(sc); + auto se = std::make_unique<MockServiceExecutor>(sc); _sexec = se.get(); sc->setServiceExecutor(std::move(se)); - auto tl = stdx::make_unique<MockTL>(); + auto tl = std::make_unique<MockTL>(); _tl = tl.get(); sc->setTransportLayer(std::move(tl)); _tl->start().transitional_ignore(); |