re PR libstdc++/12967 (Resolution of DR 300 [WP] still unimplemented)

2003-11-08  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/12967
	* include/bits/list.tcc (merge): Implement resolution of
	DR 300 [WP].
	* docs/html/ext/howto.html: Add entry for DR 300; tweak entry
	for DR 231.

	* docs/html/ext/lwg-active.html, docs/html/ext/lwg-defects.html:
	Import R27.

From-SVN: r73377

libstdc++-v3/ChangeLog

+2003-11-08  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/12967
+	* include/bits/list.tcc (merge): Implement resolution of
+	DR 300 [WP].
+	* docs/html/ext/howto.html: Add entry for DR 300; tweak entry
+	for DR 231.
+
+	* docs/html/ext/lwg-active.html, docs/html/ext/lwg-defects.html:
+	Import R27.
+
 2003-11-07  Jonathan Wakely  <redi@gcc.gnu.org>
 
 	* libsupc++/vec.cc: Conform to C++STYLE.

libstdc++-v3/docs/html/ext/howto.html

@@ -593,7 +593,7 @@
         for const instances.
     </dd>
 
-    <dt><a href="lwg-active.html#231">231</a>:
+    <dt><a href="lwg-defects.html#231">231</a>:
         <em>Precision in iostream?</em>
     </dt>
     <dd>For conversion from a floating-point type, <code>str.precision()</code>
@@ -646,6 +646,11 @@
     <dd>If <code>(this == &amp;rhs)</code> do nothing.
     </dd>
 
+    <dt><a href="lwg-defects.html#300">300</a>:
+        <em>List::merge() specification incomplete</em>
+    </dt>
+    <dd>If <code>(this == &amp;x)</code> do nothing.
+    </dd>
 <!--
     <dt><a href="lwg-defects.html#"></a>:
         <em></em>

libstdc++-v3/include/bits/list.tcc

@@ -249,6 +249,10 @@ namespace std
     list<_Tp,_Alloc>::
     merge(list& __x)
     {
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 300. list::merge() specification incomplete
+      if (this != &__x)
+	{
 	  iterator __first1 = begin();
 	  iterator __last1 = end();
 	  iterator __first2 = __x.begin();
@@ -265,6 +269,7 @@ namespace std
 	  if (__first2 != __last2)
 	    _M_transfer(__last1, __first2, __last2);
 	}
+    }
   
   // FIXME put this somewhere else
   inline void
@@ -351,6 +356,10 @@ namespace std
       list<_Tp,_Alloc>::
       merge(list& __x, _StrictWeakOrdering __comp)
       {
+	// _GLIBCXX_RESOLVE_LIB_DEFECTS
+	// 300. list::merge() specification incomplete	
+	if (this != &__x)
+	  {
 	    iterator __first1 = begin();
 	    iterator __last1 = end();
 	    iterator __first2 = __x.begin();
@@ -364,7 +373,9 @@ namespace std
 		}
 	      else
 		++__first1;
-        if (__first2 != __last2) _M_transfer(__last1, __first2, __last2);
+	    if (__first2 != __last2)
+	      _M_transfer(__last1, __first2, __last2);
+	  }
       }
   
   template<typename _Tp, typename _Alloc>