diff options
author | Nathaniel Shead <nathanieloshead@gmail.com> | 2022-11-11 22:23:31 +1100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2022-11-11 17:57:37 +0000 |
commit | 52672be7d328df50f9a05ce3ab44ebcae50fee1b (patch) | |
tree | aec8f4167e11daf4f002bf6a55e098b4b9954766 | |
parent | b331bf303bdc1edead41e2b3d11d1a7804b433cf (diff) | |
download | gcc-52672be7d328df50f9a05ce3ab44ebcae50fee1b.zip gcc-52672be7d328df50f9a05ce3ab44ebcae50fee1b.tar.gz gcc-52672be7d328df50f9a05ce3ab44ebcae50fee1b.tar.bz2 |
libstdc++: Set active union member in constexpr std::string [PR103295]
Clang still complains about using std::string in constexpr contexts due
to the changes made in commit 98a0d72a. This patch ensures that we set
the active member of the union as according to [class.union.general] p6.
libstdc++-v3/ChangeLog:
PR libstdc++/103295
* include/bits/basic_string.h (_M_use_local_data): Set active
member to _M_local_buf.
Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
-rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 9c2b57f..1099156 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -352,8 +352,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 { #if __cpp_lib_is_constant_evaluated if (std::is_constant_evaluated()) - for (_CharT& __c : _M_local_buf) - __c = _CharT(); + for (size_type __i = 0; __i <= _S_local_capacity; ++__i) + _M_local_buf[__i] = _CharT(); #endif return _M_local_data(); } |