generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add operators to make launch a bitmask type. Searched all of the standard, and libc++ to see if this error occurred elsewhere and didn't see any other place. This fixes http://llvm.org/bugs/show_bug.cgi?id=16207

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@185265 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2013-06-29 18:38:17 +00:00
parent ab135d7f4e
commit f491e51ebd
2 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
include/future
View File

@ -403,6 +403,72 @@ _LIBCPP_DECLARE_STRONG_ENUM(launch)
}; };
_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(launch) _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(launch)
#ifndef _LIBCPP_HAS_NO_STRONG_ENUMS
#ifdef _LIBCXX_UNDERLYING_TYPE
typedef underlying_type<launch>::type __launch_underlying_type;
#else
typedef int __launch_underlying_type;
#endif
inline _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR
launch
operator&(launch __x, launch __y)
{
return static_cast<launch>(static_cast<__launch_underlying_type>(__x) &
static_cast<__launch_underlying_type>(__y));
}
inline _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR
launch
operator|(launch __x, launch __y)
{
return static_cast<launch>(static_cast<__launch_underlying_type>(__x) |
static_cast<__launch_underlying_type>(__y));
}
inline _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR
launch
operator^(launch __x, launch __y)
{
return static_cast<launch>(static_cast<__launch_underlying_type>(__x) ^
static_cast<__launch_underlying_type>(__y));
}
inline _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR
launch
operator~(launch __x)
{
return static_cast<launch>(~static_cast<__launch_underlying_type>(__x));
}
inline _LIBCPP_INLINE_VISIBILITY
launch&
operator&=(launch& __x, launch __y)
{
__x = __x & __y; return __x;
}
inline _LIBCPP_INLINE_VISIBILITY
launch&
operator|=(launch& __x, launch __y)
{
__x = __x | __y; return __x;
}
inline _LIBCPP_INLINE_VISIBILITY
launch&
operator^=(launch& __x, launch __y)
{
__x = __x ^ __y; return __x;
}
#endif // !_LIBCPP_HAS_NO_STRONG_ENUMS
//enum class future_status //enum class future_status
_LIBCPP_DECLARE_STRONG_ENUM(future_status) _LIBCPP_DECLARE_STRONG_ENUM(future_status)
{ {

16
test/thread/futures/futures.overview/launch.pass.cpp
View File

@ -17,11 +17,27 @@
// }; // };
#include <future> #include <future>
#include <cassert>
int main() int main()
{ {
#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
static_assert(static_cast<int>(std::launch::any) == static_assert(static_cast<int>(std::launch::any) ==
(static_cast<int>(std::launch::async) | static_cast<int>(std::launch::deferred)), ""); (static_cast<int>(std::launch::async) | static_cast<int>(std::launch::deferred)), "");
#else
static_assert(std::launch::any == (std::launch::async | std::launch::deferred), "");
static_assert(std::launch(0) == (std::launch::async & std::launch::deferred), "");
static_assert(std::launch::any == (std::launch::async ^ std::launch::deferred), "");
static_assert(std::launch(~1) == ~std::launch::async, "");
std::launch x = std::launch::async;
x &= std::launch::deferred;
assert(x == std::launch(0));
x = std::launch::async;
x |= std::launch::deferred;
assert(x == std::launch::any);
x ^= std::launch::deferred;
assert(x == std::launch::async);
#endif
static_assert(static_cast<int>(std::launch::async) == 1, ""); static_assert(static_cast<int>(std::launch::async) == 1, "");
static_assert(static_cast<int>(std::launch::deferred) == 2, ""); static_assert(static_cast<int>(std::launch::deferred) == 2, "");
} }