diff options
| author | theraven <theraven@FreeBSD.org> | 2012-11-13 03:27:43 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2012-11-13 03:27:43 +0000 |
| commit | 8af97236b44c01761e1294025653d7f19dac7dd9 (patch) | |
| tree | b0b795ada355b89fa0679851158e12e7b0af551d /contrib/libc++/include/__mutex_base | |
| parent | af2fb35f8e88c3065ae59da7ac18d1bd2a3aca56 (diff) | |
| download | FreeBSD-src-8af97236b44c01761e1294025653d7f19dac7dd9.zip FreeBSD-src-8af97236b44c01761e1294025653d7f19dac7dd9.tar.gz | |
Import new version of libc++ into base.
Diffstat (limited to 'contrib/libc++/include/__mutex_base')
| -rw-r--r-- | contrib/libc++/include/__mutex_base | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/libc++/include/__mutex_base b/contrib/libc++/include/__mutex_base index 538e89b..e936ad3 100644 --- a/contrib/libc++/include/__mutex_base +++ b/contrib/libc++/include/__mutex_base @@ -287,14 +287,14 @@ swap(unique_lock<_Mutex>& __x, unique_lock<_Mutex>& __y) _NOEXCEPT struct _LIBCPP_VISIBLE cv_status { - enum _ { + enum __lx { no_timeout, timeout }; - _ __v_; + __lx __v_; - _LIBCPP_INLINE_VISIBILITY cv_status(_ __v) : __v_(__v) {} + _LIBCPP_INLINE_VISIBILITY cv_status(__lx __v) : __v_(__v) {} _LIBCPP_INLINE_VISIBILITY operator int() const {return __v_;} }; |
