2010-03-13 Paolo Carlini <paolo.carlini@oracle.com>

	* include/tr1_impl/array (swap(array<>&, array<>&)): Use member swap.

	* include/bits/stl_algo.h: Improve comment.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157421 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2fae3e6..2b2d063 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/tr1_impl/array (swap(array<>&, array<>&)): Use member swap.
+
+       * include/bits/stl_algo.h: Improve comment.
+
 2010-03-12  Benjamin Kosnik  <bkoz@redhat.com>
 
        * scripts/run_doxygen: Adjust.

diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 60caa43..560ac1b 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -4141,7 +4141,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       return std::make_pair(__min, __max);
     }
 
-  // N2722 + fixes.
+  // N2722 + DR 915.
   template<typename _Tp>
     inline _Tp
     min(initializer_list<_Tp> __l)

diff --git a/libstdc++-v3/include/tr1_impl/array b/libstdc++-v3/include/tr1_impl/array
index 183f636..edc4aec 100644 (file)
--- a/libstdc++-v3/include/tr1_impl/array
+++ b/libstdc++-v3/include/tr1_impl/array
@@ -229,7 +229,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
   template<typename _Tp, std::size_t _Nm>
     inline void
     swap(array<_Tp, _Nm>& __one, array<_Tp, _Nm>& __two)
-    { std::swap_ranges(__one.begin(), __one.end(), __two.begin()); }
+    { __one.swap(__two); }
 
   // Tuple interface to class template array [6.2.2.5].