aboutsummaryrefslogtreecommitdiff
path: root/lib/libcxx/src/future.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-10-02 10:45:56 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-10-02 10:45:56 -0700
commitdde0adcb363f3a3f306c0fc9eaec511cc3b74965 (patch)
tree9388d039a0b77211936c7264f5a3179f63ad51e6 /lib/libcxx/src/future.cpp
parentc4cd592f0e1eeff5a4056796610d97010ae4e38c (diff)
parent7a2624c3e40e2386a4a8a775b839e1d67608ec42 (diff)
downloadzig-dde0adcb363f3a3f306c0fc9eaec511cc3b74965.tar.gz
zig-dde0adcb363f3a3f306c0fc9eaec511cc3b74965.zip
Merge branch 'llvm13'
Diffstat (limited to 'lib/libcxx/src/future.cpp')
-rw-r--r--lib/libcxx/src/future.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libcxx/src/future.cpp b/lib/libcxx/src/future.cpp
index 58d0b4c247..4c59f89e56 100644
--- a/lib/libcxx/src/future.cpp
+++ b/lib/libcxx/src/future.cpp
@@ -19,12 +19,12 @@ class _LIBCPP_HIDDEN __future_error_category
: public __do_message
{
public:
- virtual const char* name() const _NOEXCEPT;
+ virtual const char* name() const noexcept;
virtual string message(int ev) const;
};
const char*
-__future_error_category::name() const _NOEXCEPT
+__future_error_category::name() const noexcept
{
return "future";
}
@@ -65,7 +65,7 @@ __future_error_category::message(int ev) const
#endif
const error_category&
-future_category() _NOEXCEPT
+future_category() noexcept
{
static __future_error_category __f;
return __f;
@@ -77,12 +77,12 @@ future_error::future_error(error_code __ec)
{
}
-future_error::~future_error() _NOEXCEPT
+future_error::~future_error() noexcept
{
}
void
-__assoc_sub_state::__on_zero_shared() _NOEXCEPT
+__assoc_sub_state::__on_zero_shared() noexcept
{
delete this;
}