diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2021-11-17 15:05:43 +0000 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2021-11-17 17:28:52 +0000 |
commit | 5ea8803e65eb546f58d3dccf5aff94a1638ba8b2 (patch) | |
tree | 0e20acb7fff588520d5d2e8bed4fbfdfcc6f0bd5 /libstdc++-v3/include/experimental | |
parent | 5a9572e486a8556116aa842d68c1ac8a0bdf0a0b (diff) |
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.
Diffstat (limited to 'libstdc++-v3/include/experimental')
-rw-r--r-- | libstdc++-v3/include/experimental/internet | 8 |
1 files 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; } |