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/unittest | |
| parent | c9548e729c8fecd9d7a9a5dd341da0433194ac73 (diff) | |
| download | mongo-c36f9ecb91e49da7e637863889804fc4e6c6c05e.tar.gz | |
SERVER-39339 Remove `stdx/memory.h`
Diffstat (limited to 'src/mongo/unittest')
| -rw-r--r-- | src/mongo/unittest/death_test.h | 3 | ||||
| -rw-r--r-- | src/mongo/unittest/unittest.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/unittest/death_test.h b/src/mongo/unittest/death_test.h index df468c26ee5..0f1516f6968 100644 --- a/src/mongo/unittest/death_test.h +++ b/src/mongo/unittest/death_test.h @@ -32,7 +32,6 @@ #include <memory> #include <string> -#include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" /** @@ -108,7 +107,7 @@ public: template <typename... Args> DeathTest(Args&&... args) - : DeathTestImpl([args...]() { return stdx::make_unique<T>(args...); }) {} + : DeathTestImpl([args...]() { return std::make_unique<T>(args...); }) {} private: std::string getPattern() override { diff --git a/src/mongo/unittest/unittest.cpp b/src/mongo/unittest/unittest.cpp index 72ee87d30c6..764be0908d0 100644 --- a/src/mongo/unittest/unittest.cpp +++ b/src/mongo/unittest/unittest.cpp @@ -36,6 +36,7 @@ #include <functional> #include <iostream> #include <map> +#include <memory> #include "mongo/base/checked_cast.h" #include "mongo/base/init.h" @@ -45,7 +46,6 @@ #include "mongo/logger/logger.h" #include "mongo/logger/message_event_utf8_encoder.h" #include "mongo/logger/message_log_domain.h" -#include "mongo/stdx/memory.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" #include "mongo/util/log.h" |