From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id E3C633858413; Fri, 19 Nov 2021 20:19:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E3C633858413 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-5421] libstdc++: One more change for Clang to support constexpr std::string [PR103295] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: fc6c6f64ecff376902e7e1ef295f2d8518407ab5 X-Git-Newrev: 1f8d01eb1476a997eb1fc686b60fccdf97747faa Message-Id: <20211119201903.E3C633858413@sourceware.org> Date: Fri, 19 Nov 2021 20:19:03 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Nov 2021 20:19:04 -0000 https://gcc.gnu.org/g:1f8d01eb1476a997eb1fc686b60fccdf97747faa commit r12-5421-g1f8d01eb1476a997eb1fc686b60fccdf97747faa Author: Jonathan Wakely Date: Fri Nov 19 18:27:59 2021 +0000 libstdc++: One more change for Clang to support constexpr std::string [PR103295] All writes into the allocated buffer need to be via traits_type::assign to begin lifetimes. libstdc++-v3/ChangeLog: PR libstdc++/103295 * include/bits/basic_string.tcc (_M_construct): Use the traits assign member to write into allcoated memory. Diff: --- libstdc++-v3/include/bits/basic_string.tcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 374406c0e13..6f619a08f70 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -201,7 +201,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data(__another); _M_capacity(__capacity); } - _M_data()[__len++] = *__beg; + traits_type::assign(_M_data()[__len++], *__beg); ++__beg; }