summaryrefslogtreecommitdiff
path: root/include/future
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2018-07-28 11:07:56 +0000
committerDimitry Andric <dim@FreeBSD.org>2018-07-28 11:07:56 +0000
commitf36202620b428c45a1c8d91743727c9313424fb2 (patch)
tree14928d8970ba4890a6370aca4c38fc832d45f21f /include/future
parent0294ba5648d889e48ffee8ddad25944e258940ae (diff)
Notes
Diffstat (limited to 'include/future')
-rw-r--r--include/future12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/future b/include/future
index a7c28a4746cf6..0f6d42678ef5c 100644
--- a/include/future
+++ b/include/future
@@ -409,7 +409,7 @@ _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(launch)
#ifndef _LIBCPP_HAS_NO_STRONG_ENUMS
-#ifdef _LIBCXX_UNDERLYING_TYPE
+#ifdef _LIBCPP_UNDERLYING_TYPE
typedef underlying_type<launch>::type __launch_underlying_type;
#else
typedef int __launch_underlying_type;
@@ -514,7 +514,7 @@ public:
virtual ~future_error() _NOEXCEPT;
};
-_LIBCPP_NORETURN inline _LIBCPP_ALWAYS_INLINE
+_LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY
#ifndef _LIBCPP_NO_EXCEPTIONS
_LIBCPP_AVAILABILITY_FUTURE_ERROR
#endif
@@ -2021,7 +2021,7 @@ public:
class = typename enable_if
<
!is_same<
- typename decay<_Fp>::type,
+ typename __uncvref<_Fp>::type,
packaged_task
>::value
>::type
@@ -2032,7 +2032,7 @@ public:
class = typename enable_if
<
!is_same<
- typename decay<_Fp>::type,
+ typename __uncvref<_Fp>::type,
packaged_task
>::value
>::type
@@ -2150,7 +2150,7 @@ public:
class = typename enable_if
<
!is_same<
- typename decay<_Fp>::type,
+ typename __uncvref<_Fp>::type,
packaged_task
>::value
>::type
@@ -2161,7 +2161,7 @@ public:
class = typename enable_if
<
!is_same<
- typename decay<_Fp>::type,
+ typename __uncvref<_Fp>::type,
packaged_task
>::value
>::type