diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-10-30 19:06:59 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-10-30 19:06:59 +0000 |
| commit | 54d333a601a84e10710463e845f9f3a0cb6ca72b (patch) | |
| tree | 23a7b23123e2088218754a31f9f60912626635c9 /libcxx/include/__mutex_base | |
| parent | eac2887143bc33febe1cbbe308b2cef749e28284 (diff) | |
| download | bcm5719-llvm-54d333a601a84e10710463e845f9f3a0cb6ca72b.tar.gz bcm5719-llvm-54d333a601a84e10710463e845f9f3a0cb6ca72b.zip | |
Rename uses of _ and __ because these are getting stepped on by macros from other system code.
llvm-svn: 167038
Diffstat (limited to 'libcxx/include/__mutex_base')
| -rw-r--r-- | libcxx/include/__mutex_base | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base index 538e89bedf8..e936ad3057b 100644 --- a/libcxx/include/__mutex_base +++ b/libcxx/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_;} }; |
