@@ -370,11 +370,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template<typename _Tp, typename _Alloc>
void
list<_Tp, _Alloc>::
-#if __cplusplus >= 201103L
- merge(list&& __x)
-#else
merge(list& __x)
-#endif
{
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 300. list::merge() specification incomplete
@@ -407,11 +403,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template <typename _StrictWeakOrdering>
void
list<_Tp, _Alloc>::
-#if __cplusplus >= 201103L
- merge(list&& __x, _StrictWeakOrdering __comp)
-#else
merge(list& __x, _StrictWeakOrdering __comp)
-#endif
{
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 300. list::merge() specification incomplete
@@ -1611,16 +1611,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
* sorted order, leaving @a __x empty when complete. Elements in
* this list precede elements in @a __x that are equal.
*/
-#if __cplusplus >= 201103L
void
- merge(list&& __x);
+ merge(list&);
+#if __cplusplus >= 201103L
void
- merge(list& __x)
- { merge(std::move(__x)); }
-#else
- void
- merge(list& __x);
+ merge(list&& __x)
+ { merge(__x); }
#endif
/**
@@ -1636,19 +1633,15 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
* in this list precede elements in @a __x that are equivalent
* according to StrictWeakOrdering().
*/
-#if __cplusplus >= 201103L
template<typename _StrictWeakOrdering>
void
- merge(list&& __x, _StrictWeakOrdering __comp);
+ merge(list&, _StrictWeakOrdering);
+#if __cplusplus >= 201103L
template<typename _StrictWeakOrdering>
void
- merge(list& __x, _StrictWeakOrdering __comp)
- { merge(std::move(__x), __comp); }
-#else
- template<typename _StrictWeakOrdering>
- void
- merge(list& __x, _StrictWeakOrdering __comp);
+ merge(list&& __x, _StrictWeakOrdering __comp)
+ { merge(__x, __comp); }
#endif
/**