commit 4da2a19f05326b408d0d137666944743bfbbd67f
author Marshall Clow <mclow.lists@gmail.com> Mon Dec 23 22:14:27 2013 +0000
committer Copybara-Service <copybara-worker@google.com> Wed Feb 12 17:18:14 2020 -0800
tree f4a5c485d9a8cb6e017556e22a4c52f83cb564d0
parent e299f1f9cc4b19b1fb43b4e4e2ddbf69f19479e9

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

llvm-svn: 197921
GitOrigin-RevId: ce81aed463eadb24bfe79d4103b39f8dfc21b1b8

include/__mutex_base

diff --git a/include/__mutex_base b/include/__mutex_base
index d4023a6..abb1c12 100644
--- a/include/__mutex_base
+++ b/include/__mutex_base
@@ -254,19 +254,13 @@
 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
 {

test/thread/thread.condition/cv_status.pass.cpp

diff --git a/test/thread/thread.condition/cv_status.pass.cpp b/test/thread/thread.condition/cv_status.pass.cpp
index d897657..d5e0947 100644
--- a/test/thread/thread.condition/cv_status.pass.cpp
+++ b/test/thread/thread.condition/cv_status.pass.cpp
@@ -16,6 +16,6 @@
 
 int main()
 {
-    assert(std::cv_status::no_timeout == 0);
-    assert(std::cv_status::timeout == 1);
+    assert(static_cast<int>(std::cv_status::no_timeout) == 0);
+    assert(static_cast<int>(std::cv_status::timeout)    == 1);
 }