diff options
| -rw-r--r-- | libcxx/include/future | 66 | ||||
| -rw-r--r-- | libcxx/test/thread/futures/futures.overview/launch.pass.cpp | 16 |
2 files changed, 82 insertions, 0 deletions
diff --git a/libcxx/include/future b/libcxx/include/future index 3d7bb6c9d04..160114e5901 100644 --- a/libcxx/include/future +++ b/libcxx/include/future @@ -403,6 +403,72 @@ _LIBCPP_DECLARE_STRONG_ENUM(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 _LIBCPP_DECLARE_STRONG_ENUM(future_status) { diff --git a/libcxx/test/thread/futures/futures.overview/launch.pass.cpp b/libcxx/test/thread/futures/futures.overview/launch.pass.cpp index 75534f793c8..d634c8b54c3 100644 --- a/libcxx/test/thread/futures/futures.overview/launch.pass.cpp +++ b/libcxx/test/thread/futures/futures.overview/launch.pass.cpp @@ -17,11 +17,27 @@ // }; #include <future> +#include <cassert> int main() { +#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS static_assert(static_cast<int>(std::launch::any) == (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::deferred) == 2, ""); } |
