diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-01 12:34:23 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-01 12:34:23 +0000 |
| commit | 2ecf94489e8835fed3ed2fe07feb58fcc2f83501 (patch) | |
| tree | 6b9c45153a20f922cd3594e7183ae99ca34a8fcb /libstdc++-v3 | |
| parent | 3d532fdd9e3b910125490cdd660086ded1d84ccb (diff) | |
| download | ppe42-gcc-2ecf94489e8835fed3ed2fe07feb58fcc2f83501.tar.gz ppe42-gcc-2ecf94489e8835fed3ed2fe07feb58fcc2f83501.zip | |
* include/bits/vector.tcc (vector::_M_fill_assign): Use _M_swap_data.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@215757 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/vector.tcc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f7563d0ad62..fde13505c26 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2014-10-01 Jonathan Wakely <jwakely@redhat.com> + * include/bits/vector.tcc (vector::_M_fill_assign): Use _M_swap_data. + +2014-10-01 Jonathan Wakely <jwakely@redhat.com> + * include/bits/stl_queue.h: Include missing header. * include/bits/stl_stack.h: Likewise. * testsuite/23_containers/priority_queue/requirements/ diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index c937b3887d7..704a64426d1 100644 --- a/libstdc++-v3/include/bits/vector.tcc +++ b/libstdc++-v3/include/bits/vector.tcc @@ -228,7 +228,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER if (__n > capacity()) { vector __tmp(__n, __val, _M_get_Tp_allocator()); - __tmp.swap(*this); + __tmp._M_impl._M_swap_data(this->_M_impl); } else if (__n > size()) { |
