]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Fix _GLIBCXX_DEBUG std::forward_list build regression
authorJonathan Wakely <jwakely@redhat.com>
Tue, 8 Jul 2025 17:20:13 +0000 (19:20 +0200)
committerFrançois Dumont <fdumont@gcc.gnu.org>
Tue, 8 Jul 2025 17:25:57 +0000 (19:25 +0200)
Commit 2fd6f42c17a8040dbd3460ca34d93695dacf8575 broke _GLIBCXX_DEBUG
std::forward_list implementation.

libstdc++-v3/ChangeLog:

* include/debug/forward_list (_Safe_forward_list<>::_M_swap):
Adapt to _M_this() signature change.

libstdc++-v3/include/debug/forward_list

index 4e1511da4e826ce20477abd93304b1e2fdd6e1d3..9da7dda45034ecce617103b80ddf0399c1ac2bbd 100644 (file)
@@ -144,13 +144,13 @@ namespace __gnu_debug
       //std::swap(_M_this()->_M_version, __other._M_version);
       _Safe_iterator_base* __this_its = _M_this()->_M_iterators;
       _S_swap_aux(__other, __other._M_iterators,
-                 _M_this(), _M_this()->_M_iterators);
+                 *_M_this(), _M_this()->_M_iterators);
       _Safe_iterator_base* __this_const_its = _M_this()->_M_const_iterators;
       _S_swap_aux(__other, __other._M_const_iterators,
-                 _M_this(), _M_this()->_M_const_iterators);
-      _S_swap_aux(_M_this(), __this_its,
+                 *_M_this(), _M_this()->_M_const_iterators);
+      _S_swap_aux(*_M_this(), __this_its,
                  __other, __other._M_iterators);
-      _S_swap_aux(_M_this(), __this_const_its,
+      _S_swap_aux(*_M_this(), __this_const_its,
                  __other, __other._M_const_iterators);
     }