SERVER-19099 Use std:: to back stdx polyfills

5 files changed, 25 insertions, 27 deletions

diff --git a/src/mongo/stdx/chrono.h b/src/mongo/stdx/chrono.h
index 47ab2a2d231..39d49cd876c 100644
--- a/src/mongo/stdx/chrono.h
+++ b/src/mongo/stdx/chrono.h
@@ -28,12 +28,12 @@
 
 #pragma once
 
-#include <boost/chrono.hpp>
+#include <chrono>
 
 namespace mongo {
 namespace stdx {
 
-namespace chrono = boost::chrono;  // NOLINT
+namespace chrono = ::std::chrono;  // NOLINT
 
 }  // namespace stdx
 }  // namespace mongo
diff --git a/src/mongo/stdx/condition_variable.h b/src/mongo/stdx/condition_variable.h
index 206a9e84465..d2dcd0a9a57 100644
--- a/src/mongo/stdx/condition_variable.h
+++ b/src/mongo/stdx/condition_variable.h
@@ -28,14 +28,14 @@
 
 #pragma once
 
-#include <boost/thread/condition_variable.hpp>
+#include <condition_variable>
 
 namespace mongo {
 namespace stdx {
 
-using condition_variable = boost::condition_variable;          // NOLINT
-using condition_variable_any = boost::condition_variable_any;  // NOLINT
-using cv_status = boost::cv_status;                            // NOLINT
+using condition_variable = ::std::condition_variable;          // NOLINT
+using condition_variable_any = ::std::condition_variable_any;  // NOLINT
+using cv_status = ::std::cv_status;                            // NOLINT
 
 }  // namespace stdx
 }  // namespace mongo
diff --git a/src/mongo/stdx/future.h b/src/mongo/stdx/future.h
index bc4816aff6f..c16b3c5996b 100644
--- a/src/mongo/stdx/future.h
+++ b/src/mongo/stdx/future.h
@@ -28,17 +28,17 @@
 
 #pragma once
 
-#include <boost/thread/future.hpp>
+#include <future>
 
 namespace mongo {
 namespace stdx {
 
-using boost::async;          // NOLINT
-using boost::future;         // NOLINT
-using boost::future_status;  // NOLINT
-using boost::launch;         // NOLINT
-using boost::packaged_task;  // NOLINT
-using boost::promise;        // NOLINT
+using ::std::async;          // NOLINT
+using ::std::future;         // NOLINT
+using ::std::future_status;  // NOLINT
+using ::std::launch;         // NOLINT
+using ::std::packaged_task;  // NOLINT
+using ::std::promise;        // NOLINT
 
 }  // namespace stdx
 }  // namespace mongo
diff --git a/src/mongo/stdx/mutex.h b/src/mongo/stdx/mutex.h
index 4303d25fba2..51c7318c639 100644
--- a/src/mongo/stdx/mutex.h
+++ b/src/mongo/stdx/mutex.h
@@ -28,23 +28,21 @@
 
 #pragma once
 
-#include <boost/thread/locks.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/recursive_mutex.hpp>
+#include <mutex>
 
 namespace mongo {
 namespace stdx {
 
-using boost::mutex;            // NOLINT
-using boost::timed_mutex;      // NOLINT
-using boost::recursive_mutex;  // NOLINT
+using ::std::mutex;            // NOLINT
+using ::std::timed_mutex;      // NOLINT
+using ::std::recursive_mutex;  // NOLINT
 
-using boost::adopt_lock_t;   // NOLINT
-using boost::defer_lock_t;   // NOLINT
-using boost::try_to_lock_t;  // NOLINT
+using ::std::adopt_lock_t;   // NOLINT
+using ::std::defer_lock_t;   // NOLINT
+using ::std::try_to_lock_t;  // NOLINT
 
-using boost::lock_guard;   // NOLINT
-using boost::unique_lock;  // NOLINT
+using ::std::lock_guard;   // NOLINT
+using ::std::unique_lock;  // NOLINT
 
 #if _MSC_VER < 1900
 #define MONGO_STDX_CONSTEXPR const
diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h
index e46900c02a3..2c88ba31119 100644
--- a/src/mongo/stdx/thread.h
+++ b/src/mongo/stdx/thread.h
@@ -28,13 +28,13 @@
 
 #pragma once
 
-#include <boost/thread.hpp>
+#include <thread>
 
 namespace mongo {
 namespace stdx {
 
-using thread = boost::thread;                // NOLINT
-namespace this_thread = boost::this_thread;  // NOLINT
+using thread = ::std::thread;                // NOLINT
+namespace this_thread = ::std::this_thread;  // NOLINT
 
 }  // namespace stdx
 }  // namespace mongo