diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2013-12-23 22:14:27 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2013-12-23 22:14:27 +0000 |
| commit | ce81aed463eadb24bfe79d4103b39f8dfc21b1b8 (patch) | |
| tree | c75b1d965effedc5a6bfa760a8801d09a93072ef /libcxx/include/__mutex_base | |
| parent | 61d41af46b9412194dc2cfbd0db3f315a1f80da9 (diff) | |
| download | bcm5719-llvm-ce81aed463eadb24bfe79d4103b39f8dfc21b1b8.tar.gz bcm5719-llvm-ce81aed463eadb24bfe79d4103b39f8dfc21b1b8.zip | |
Make cv_status a class enum. Fixes PR18314. Thanks to Andersca for the report and the patch.
llvm-svn: 197921
Diffstat (limited to 'libcxx/include/__mutex_base')
| -rw-r--r-- | libcxx/include/__mutex_base | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base index d4023a64f9f..abb1c125804 100644 --- a/libcxx/include/__mutex_base +++ b/libcxx/include/__mutex_base @@ -254,19 +254,13 @@ void swap(unique_lock<_Mutex>& __x, unique_lock<_Mutex>& __y) _NOEXCEPT {__x.swap(__y);} -struct _LIBCPP_TYPE_VIS cv_status +//enum class cv_status +_LIBCPP_DECLARE_STRONG_ENUM(cv_status) { - enum __lx { - no_timeout, - timeout - }; - - __lx __v_; - - _LIBCPP_INLINE_VISIBILITY cv_status(__lx __v) : __v_(__v) {} - _LIBCPP_INLINE_VISIBILITY operator int() const {return __v_;} - + no_timeout, + timeout }; +_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(cv_status) class _LIBCPP_TYPE_VIS condition_variable { |
