aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2010-03-13 12:47:09 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2010-03-13 12:47:09 +0000
commite962c1b0f424781a95684d0ca4e0dbab3a39b8b8 (patch)
tree55062433ed07dc454121afa6622cf79275a88d0c
parent929769f4ea0bbebf3a4a15bdc72ccd353789848f (diff)
downloadgcc-e962c1b0f424781a95684d0ca4e0dbab3a39b8b8.zip
gcc-e962c1b0f424781a95684d0ca4e0dbab3a39b8b8.tar.gz
gcc-e962c1b0f424781a95684d0ca4e0dbab3a39b8b8.tar.bz2
array (swap(array<>&, array<>&)): Use member swap.
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. From-SVN: r157421
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/bits/stl_algo.h2
-rw-r--r--libstdc++-v3/include/tr1_impl/array2
3 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2fae3e6..2b2d063 100644
--- 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
--- 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
--- 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].