From de2dc62379b7a2c93e11b03804380af072fd249b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 22 Oct 2024 21:23:06 +0100 Subject: [PATCH] libstdc++: Replace std::__to_address in C++20 branch in As noted by Patrick, r15-4546-g85e5b80ee2de80 should have changed the usage of std::__to_address to std::to_address in the C++20-specific branch that works on types satisfying std::contiguous_iterator. libstdc++-v3/ChangeLog: * include/bits/basic_string.h (assign(Iter, Iter)): Call std::to_address instead of __to_address. Reviewed-by: Patrick Palka --- libstdc++-v3/include/bits/basic_string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 16e356e06786..28b3e5361855 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -1748,7 +1748,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 { __glibcxx_requires_valid_range(__first, __last); return _M_replace(size_type(0), size(), - std::__to_address(__first), __last - __first); + std::to_address(__first), __last - __first); } #endif else -- 2.47.2