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/typeinfo.cpp | |
| parent | c4cd592f0e1eeff5a4056796610d97010ae4e38c (diff) | |
| parent | 7a2624c3e40e2386a4a8a775b839e1d67608ec42 (diff) | |
| download | zig-dde0adcb363f3a3f306c0fc9eaec511cc3b74965.tar.gz zig-dde0adcb363f3a3f306c0fc9eaec511cc3b74965.zip | |
Merge branch 'llvm13'
Diffstat (limited to 'lib/libcxx/src/typeinfo.cpp')
| -rw-r--r-- | lib/libcxx/src/typeinfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libcxx/src/typeinfo.cpp b/lib/libcxx/src/typeinfo.cpp index 49a07ef7da..ce3867ea93 100644 --- a/lib/libcxx/src/typeinfo.cpp +++ b/lib/libcxx/src/typeinfo.cpp @@ -11,18 +11,18 @@ #if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_ABI_VCRUNTIME) #include <string.h> -int std::type_info::__compare(const type_info &__rhs) const _NOEXCEPT { +int std::type_info::__compare(const type_info &__rhs) const noexcept { if (&__data == &__rhs.__data) return 0; return strcmp(&__data.__decorated_name[1], &__rhs.__data.__decorated_name[1]); } -const char *std::type_info::name() const _NOEXCEPT { +const char *std::type_info::name() const noexcept { // TODO(compnerd) cache demangled &__data.__decorated_name[1] return &__data.__decorated_name[1]; } -size_t std::type_info::hash_code() const _NOEXCEPT { +size_t std::type_info::hash_code() const noexcept { #if defined(_WIN64) constexpr size_t fnv_offset_basis = 14695981039346656037ull; constexpr size_t fnv_prime = 10995116282110ull; |