summaryrefslogtreecommitdiffstats
path: root/contrib/libc++/include/__mutex_base
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/libc++/include/__mutex_base')
-rw-r--r--contrib/libc++/include/__mutex_base6
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_;}
};
OpenPOWER on IntegriCloud