diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-10-02 10:45:56 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-10-02 10:45:56 -0700 |
| commit | dde0adcb363f3a3f306c0fc9eaec511cc3b74965 (patch) | |
| tree | 9388d039a0b77211936c7264f5a3179f63ad51e6 /lib/libcxx/src/include/refstring.h | |
| parent | c4cd592f0e1eeff5a4056796610d97010ae4e38c (diff) | |
| parent | 7a2624c3e40e2386a4a8a775b839e1d67608ec42 (diff) | |
| download | zig-dde0adcb363f3a3f306c0fc9eaec511cc3b74965.tar.gz zig-dde0adcb363f3a3f306c0fc9eaec511cc3b74965.zip | |
Merge branch 'llvm13'
Diffstat (limited to 'lib/libcxx/src/include/refstring.h')
| -rw-r--r-- | lib/libcxx/src/include/refstring.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcxx/src/include/refstring.h b/lib/libcxx/src/include/refstring.h index cefd7caf0f..ad6cd162fb 100644 --- a/lib/libcxx/src/include/refstring.h +++ b/lib/libcxx/src/include/refstring.h @@ -55,7 +55,7 @@ inline char * data_from_rep(_Rep_base *rep) noexcept { #if defined(_LIBCPP_CHECK_FOR_GCC_EMPTY_STRING_STORAGE) inline -const char* compute_gcc_empty_string_storage() _NOEXCEPT +const char* compute_gcc_empty_string_storage() noexcept { void* handle = dlopen("/usr/lib/libstdc++.6.dylib", RTLD_NOLOAD); if (handle == nullptr) @@ -68,7 +68,7 @@ const char* compute_gcc_empty_string_storage() _NOEXCEPT inline const char* -get_gcc_empty_string_storage() _NOEXCEPT +get_gcc_empty_string_storage() noexcept { static const char* p = compute_gcc_empty_string_storage(); return p; @@ -92,7 +92,7 @@ __libcpp_refstring::__libcpp_refstring(const char* msg) { } inline -__libcpp_refstring::__libcpp_refstring(const __libcpp_refstring &s) _NOEXCEPT +__libcpp_refstring::__libcpp_refstring(const __libcpp_refstring &s) noexcept : __imp_(s.__imp_) { if (__uses_refcount()) @@ -100,7 +100,7 @@ __libcpp_refstring::__libcpp_refstring(const __libcpp_refstring &s) _NOEXCEPT } inline -__libcpp_refstring& __libcpp_refstring::operator=(__libcpp_refstring const& s) _NOEXCEPT { +__libcpp_refstring& __libcpp_refstring::operator=(__libcpp_refstring const& s) noexcept { bool adjust_old_count = __uses_refcount(); struct _Rep_base *old_rep = rep_from_data(__imp_); __imp_ = s.__imp_; |