diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2025-01-10 19:25:56 +0900 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2025-01-10 19:25:56 +0900 |
| commit | 63f5dc16d6bfca0512fb034052b41d13c3751e20 (patch) | |
| tree | e70266be1fda941e0974e71e3d2c1cf080081311 /libcxx/include/string | |
| parent | 9e5734688ed3d5f6b3fb76a26b3d90a736d60781 (diff) | |
| parent | 397ac44f623f891d8f05d6673a95984ac0a26671 (diff) | |
| download | llvm-users/chapuni/cov/single/unify.zip llvm-users/chapuni/cov/single/unify.tar.gz llvm-users/chapuni/cov/single/unify.tar.bz2 | |
Merge branch 'main' into users/chapuni/cov/single/unifyusers/chapuni/cov/single/unify
Diffstat (limited to 'libcxx/include/string')
| -rw-r--r-- | libcxx/include/string | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/string b/libcxx/include/string index 7808f56..39982d5 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -764,7 +764,7 @@ struct __padding<0> {}; template <class _CharT, class _Traits, class _Allocator> class basic_string { private: - using __default_allocator_type = allocator<_CharT>; + using __default_allocator_type _LIBCPP_NODEBUG = allocator<_CharT>; public: typedef basic_string __self; @@ -798,7 +798,7 @@ public: // Therefore it's crucial to ensure the destructor is called. using __trivially_relocatable = void; # else - using __trivially_relocatable = __conditional_t< + using __trivially_relocatable _LIBCPP_NODEBUG = __conditional_t< __libcpp_is_trivially_relocatable<allocator_type>::value && __libcpp_is_trivially_relocatable<pointer>::value, basic_string, void>; |