summaryrefslogtreecommitdiffstats
path: root/lib/libcxx/include/future
diff options
context:
space:
mode:
authorpatrick <patrick@openbsd.org>2019-02-04 16:55:44 +0000
committerpatrick <patrick@openbsd.org>2019-02-04 16:55:44 +0000
commit76c648e7a477ffb2a882ad5ffe523269bd9a3f6a (patch)
tree29d319d598650bab04e4f58e5e8769567e33091e /lib/libcxx/include/future
parentImport libc++abi 7.0.1. (diff)
downloadwireguard-openbsd-76c648e7a477ffb2a882ad5ffe523269bd9a3f6a.tar.xz
wireguard-openbsd-76c648e7a477ffb2a882ad5ffe523269bd9a3f6a.zip
Import libc++ 7.0.1.
Diffstat (limited to 'lib/libcxx/include/future')
-rw-r--r--lib/libcxx/include/future12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libcxx/include/future b/lib/libcxx/include/future
index a7c28a4746c..0f6d42678ef 100644
--- a/lib/libcxx/include/future
+++ b/lib/libcxx/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