From: François Dumont <frs.dumont@gmail.com>
Date: Mon, 22 Sep 2025 16:54:46 +0000 (+0200)
Subject: libstdc++: std::inplace_vector implementation cleaup
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f5f3eef1d5796defc37ebb46f7ad44d894c14cf;p=thirdparty%2Fgcc.git

libstdc++: std::inplace_vector implementation cleaup

Remove duplicated std::swap implementation.

libstdc++-v3/ChangeLog

	* include/std/inplace_vector:
	(std::swap(inplace_vector<>&, inplace_vector<>&)): Remove the duplicated
	implementation at std namespace level. Keep the friend inline one.
	(inplace_vector<Tp, 0>::assign(initializer_list<>)): Add missing return
	statement.
---

diff --git a/libstdc++-v3/include/std/inplace_vector b/libstdc++-v3/include/std/inplace_vector
index 91ceace08f5..7aa6f9d4ab2 100644
--- a/libstdc++-v3/include/std/inplace_vector
+++ b/libstdc++-v3/include/std/inplace_vector
@@ -823,6 +823,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 						      __detail::__synth3way);
       }
 
+      // [inplace.vector.special], specialized algorithms
       constexpr friend void
       swap(inplace_vector& __x, inplace_vector& __y)
       noexcept(is_nothrow_swappable_v<_Tp> && is_nothrow_move_constructible_v<_Tp>)
@@ -907,13 +908,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	}
     };
 
-  // [inplace.vector.special], specialized algorithms
-  template<typename _Tp, size_t _Nm>
-    constexpr void
-    swap(inplace_vector<_Tp, _Nm>& __x, inplace_vector<_Tp, _Nm>& __y)
-    noexcept(noexcept(__x.swap(__y)))
-    { __x.swap(__y); }
-
   // specialization for zero capacity, that is required to be trivally copyable
   // and empty regardless of _Tp.
   template<typename _Tp>
@@ -992,6 +986,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       {
 	if (__il.size() != 0)
 	  __throw_bad_alloc();
+	return *this;
       }
 
       template<__any_input_iterator _InputIterator>