diff options
| author | Adam Midvidy <amidvidy@gmail.com> | 2015-06-17 14:29:48 -0400 |
|---|---|---|
| committer | Adam Midvidy <amidvidy@gmail.com> | 2015-06-18 13:09:18 -0400 |
| commit | 149d8c8f83017db23b104da1f020d0a994fb79f9 (patch) | |
| tree | b3de559193c25708fca27234f8d498f08d444ac9 /src/mongo/util/net | |
| parent | dd759f777875702f9618ed9379c5379247cdb7d1 (diff) | |
| download | mongo-149d8c8f83017db23b104da1f020d0a994fb79f9.tar.gz | |
SERVER-18723 boost -> stdx for thread
Diffstat (limited to 'src/mongo/util/net')
| -rw-r--r-- | src/mongo/util/net/message_server_port.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/util/net/sock_test.cpp | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/mongo/util/net/message_server_port.cpp b/src/mongo/util/net/message_server_port.cpp index f6e5f95a44e..7c176c66764 100644 --- a/src/mongo/util/net/message_server_port.cpp +++ b/src/mongo/util/net/message_server_port.cpp @@ -31,7 +31,6 @@ #include "mongo/platform/basic.h" -#include <boost/thread/thread.hpp> #include <memory> #include "mongo/base/disallow_copying.h" @@ -40,6 +39,7 @@ #include "mongo/db/server_options.h" #include "mongo/db/stats/counters.h" #include "mongo/stdx/functional.h" +#include "mongo/stdx/thread.h" #include "mongo/util/concurrency/synchronization.h" #include "mongo/util/concurrency/thread_name.h" #include "mongo/util/concurrency/ticketholder.h" @@ -115,7 +115,7 @@ namespace { try { #ifndef __linux__ // TODO: consider making this ifdef _WIN32 { - boost::thread thr(stdx::bind(&handleIncomingMsg, portWithHandler.get())); + stdx::thread thr(stdx::bind(&handleIncomingMsg, portWithHandler.get())); } #else pthread_attr_t attrs; diff --git a/src/mongo/util/net/sock_test.cpp b/src/mongo/util/net/sock_test.cpp index dbc42903915..0a823e15f23 100644 --- a/src/mongo/util/net/sock_test.cpp +++ b/src/mongo/util/net/sock_test.cpp @@ -30,8 +30,6 @@ #include "mongo/util/net/sock.h" -#include <boost/thread.hpp> - #ifndef _WIN32 #include <netdb.h> #include <sys/socket.h> @@ -39,6 +37,7 @@ #endif #include "mongo/db/server_options.h" +#include "mongo/stdx/thread.h" #include "mongo/unittest/unittest.h" #include "mongo/util/concurrency/synchronization.h" #include "mongo/util/fail_point_service.h" @@ -147,12 +146,12 @@ namespace { Notification accepted; SOCKET acceptSock = INVALID_SOCKET; - boost::thread acceptor( + stdx::thread acceptor( stdx::bind(&detail::awaitAccept, &acceptSock, listenSock, boost::ref(accepted))); Notification connected; SOCKET connectSock = INVALID_SOCKET; - boost::thread connector( + stdx::thread connector( stdx::bind(&detail::awaitConnect, &connectSock, *connectRes, boost::ref(connected))); connected.waitToBeNotified(); |