From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 22 Oct 2024 20:23:06 +0000 (+0100)
Subject: libstdc++: Replace std::__to_address in C++20 branch in <string>
X-Git-Tag: basepoints/gcc-16~4979
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2dc62379b7a2c93e11b03804380af072fd249b;p=thirdparty%2Fgcc.git

libstdc++: Replace std::__to_address in C++20 branch in <string>

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 <ppalka@redhat.com>
---

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