LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make cv_status a class enum. Fixes PR18314. Thanks to Andersca for the report and the patch.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@197921 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2013-12-23 22:14:27 +00:00
parent f1ebe26bdb
commit 239bc42b53
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/__mutex_base
View File

@@ -254,19 +254,13 @@ void
swap(unique_lock<_Mutex>& __x, unique_lock<_Mutex>& __y) _NOEXCEPT swap(unique_lock<_Mutex>& __x, unique_lock<_Mutex>& __y) _NOEXCEPT
{__x.swap(__y);} {__x.swap(__y);}
struct _LIBCPP_TYPE_VIS cv_status //enum class cv_status
_LIBCPP_DECLARE_STRONG_ENUM(cv_status)
{ {
enum __lx {
no_timeout, no_timeout,
timeout timeout
}; };
_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(cv_status)
__lx __v_;
_LIBCPP_INLINE_VISIBILITY cv_status(__lx __v) : __v_(__v) {}
_LIBCPP_INLINE_VISIBILITY operator int() const {return __v_;}
};
class _LIBCPP_TYPE_VIS condition_variable class _LIBCPP_TYPE_VIS condition_variable
{ {

4
test/thread/thread.condition/cv_status.pass.cpp
View File

@@ -16,6 +16,6 @@
int main() int main()
{ {
assert(std::cv_status::no_timeout == 0); assert(static_cast<int>(std::cv_status::no_timeout) == 0);
assert(std::cv_status::timeout == 1); assert(static_cast<int>(std::cv_status::timeout) == 1);
} }