diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2016-05-03 16:49:32 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2016-05-03 16:49:32 -0400 |
| commit | 4ea097b36ec3d7e490c405ce66708db0d177fca6 (patch) | |
| tree | ad887d2172a13caea02210480cbd63ab59d0904d /src/mongo/stdx | |
| parent | 6b87a77ced925398b7485abaf0fa36bafcccc52a (diff) | |
| download | mongo-4ea097b36ec3d7e490c405ce66708db0d177fca6.tar.gz | |
SERVER-23548 Remove VS2013 workarounds
Diffstat (limited to 'src/mongo/stdx')
| -rw-r--r-- | src/mongo/stdx/mutex.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mongo/stdx/mutex.h b/src/mongo/stdx/mutex.h index dee03c3c0fe..91ce36d8a35 100644 --- a/src/mongo/stdx/mutex.h +++ b/src/mongo/stdx/mutex.h @@ -49,17 +49,9 @@ using ::std::try_to_lock_t; // NOLINT using ::std::lock_guard; // NOLINT using ::std::unique_lock; // NOLINT -#if _MSC_VER < 1900 -#define MONGO_STDX_CONSTEXPR const -#else -#define MONGO_STDX_CONSTEXPR constexpr -#endif - -MONGO_STDX_CONSTEXPR adopt_lock_t adopt_lock{}; -MONGO_STDX_CONSTEXPR defer_lock_t defer_lock{}; -MONGO_STDX_CONSTEXPR try_to_lock_t try_to_lock{}; - -#undef MONGO_STDX_CONSTEXPR +constexpr adopt_lock_t adopt_lock{}; +constexpr defer_lock_t defer_lock{}; +constexpr try_to_lock_t try_to_lock{}; } // namespace stdx } // namespace mongo |