summaryrefslogtreecommitdiff
path: root/src/mongo/stdx
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2017-02-26 15:23:05 -0500
committerAndrew Morrow <acm@mongodb.com>2017-06-16 11:23:28 -0400
commit2845061bc77b10dd8ed140bc20e17ffbd4f4ce5d (patch)
tree5d0630e5552bca941e1b50dd50b4d09af6c974ed /src/mongo/stdx
parent8ec35cb932d07eb034beee2b1938800675fb3c0c (diff)
downloadmongo-2845061bc77b10dd8ed140bc20e17ffbd4f4ce5d.tar.gz
SERVER-26540 Detach from boost::chrono
Diffstat (limited to 'src/mongo/stdx')
-rw-r--r--src/mongo/stdx/mutex.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mongo/stdx/mutex.h b/src/mongo/stdx/mutex.h
index 91ce36d8a35..ae9db47c9c0 100644
--- a/src/mongo/stdx/mutex.h
+++ b/src/mongo/stdx/mutex.h
@@ -33,13 +33,8 @@
namespace mongo {
namespace stdx {
-using ::std::mutex; // NOLINT
-
-// NOTE: The timed_mutex class is currently banned in our code due to
-// a buggy implementation in GCC older than 4.9.
-//
-// using ::std::timed_mutex; // NOLINT
-
+using ::std::mutex; // NOLINT
+using ::std::timed_mutex; // NOLINT
using ::std::recursive_mutex; // NOLINT
using ::std::adopt_lock_t; // NOLINT