diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-13 12:47:09 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-13 12:47:09 +0000 |
| commit | 24a23b7314c23a37790377c6b7829d6bdb21a8c0 (patch) | |
| tree | 55062433ed07dc454121afa6622cf79275a88d0c | |
| parent | 84ccaae30747590484599bf479b858820958c7d8 (diff) | |
| download | gcc-24a23b7314c23a37790377c6b7829d6bdb21a8c0.tar.gz | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_algo.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1_impl/array | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2fae3e60e28..2b2d0634b9f 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 60caa436206..560ac1bb07b 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 183f63696c7..edc4aec90b4 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]. |