]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Replace std::__to_address in C++20 branch in <string>
authorJonathan Wakely <jwakely@redhat.com>
Tue, 22 Oct 2024 20:23:06 +0000 (21:23 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Wed, 23 Oct 2024 14:12:48 +0000 (15:12 +0100)
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>
libstdc++-v3/include/bits/basic_string.h

index 16e356e067862fb2d4f9f4708cec733519a43338..28b3e5361855c6d3bd79b3260039f438511ac203 100644 (file)
@@ -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