From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id C930E3858017; Wed, 17 Nov 2021 17:30:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C930E3858017 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-5345] libstdc++: Use std::construct_at in net::ip::address X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 5a9572e486a8556116aa842d68c1ac8a0bdf0a0b X-Git-Newrev: 5ea8803e65eb546f58d3dccf5aff94a1638ba8b2 Message-Id: <20211117173006.C930E3858017@sourceware.org> Date: Wed, 17 Nov 2021 17:30:06 +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: Wed, 17 Nov 2021 17:30:06 -0000 https://gcc.gnu.org/g:5ea8803e65eb546f58d3dccf5aff94a1638ba8b2 commit r12-5345-g5ea8803e65eb546f58d3dccf5aff94a1638ba8b2 Author: Jonathan Wakely Date: Wed Nov 17 15:05:43 2021 +0000 libstdc++: Use std::construct_at in net::ip::address Using placement-new isn't valid in constant expressions, so this replaces it with std::construct_at (via the std::_Construct function that is usable before C++20). libstdc++-v3/ChangeLog: * include/experimental/internet (address): Use std::_Construct to initialize union members. Diff: --- libstdc++-v3/include/experimental/internet | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/experimental/internet b/libstdc++-v3/include/experimental/internet index 95b8cdc9963..5e2ef00c16f 100644 --- a/libstdc++-v3/include/experimental/internet +++ b/libstdc++-v3/include/experimental/internet @@ -466,9 +466,9 @@ namespace ip address(const address& __a) noexcept : _M_uninit(), _M_is_v4(__a._M_is_v4) { if (_M_is_v4) - ::new (std::addressof(_M_v4)) address_v4(__a.to_v4()); + std::_Construct(std::addressof(_M_v4), __a.to_v4()); else - ::new (std::addressof(_M_v6)) address_v6(__a.to_v6()); + std::_Construct(std::addressof(_M_v6), __a.to_v6()); } constexpr @@ -491,7 +491,7 @@ namespace ip address& operator=(const address_v4& __a) noexcept { - ::new (std::addressof(_M_v4)) address_v4(__a); + std::_Construct(std::addressof(_M_v4), __a); _M_is_v4 = true; return *this; } @@ -499,7 +499,7 @@ namespace ip address& operator=(const address_v6& __a) noexcept { - ::new (std::addressof(_M_v6)) address_v6(__a); + std::_Construct(std::addressof(_M_v6), __a); _M_is_v4 = false; return *this; }