diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-09-25 13:14:15 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-09-25 13:14:15 +0100 |
| commit | c5b2614754a2c8fc3e03048d56fe328446aab972 (patch) | |
| tree | 3a3250cab03dc4363f1fc8d817d1863a298e415f | |
| parent | 755176105fab84455f5b30283710c878ce1c4a61 (diff) | |
| download | gcc-c5b2614754a2c8fc3e03048d56fe328446aab972.zip gcc-c5b2614754a2c8fc3e03048d56fe328446aab972.tar.gz gcc-c5b2614754a2c8fc3e03048d56fe328446aab972.tar.bz2 | |
* include/bits/vector.tcc (vector::_M_fill_assign): Use _M_swap_data.
From-SVN: r215596
| -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 172fc09..4bbb952 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2014-09-25 Jonathan Wakely <jwakely@redhat.com> + * include/bits/vector.tcc (vector::_M_fill_assign): Use _M_swap_data. + +2014-09-25 Jonathan Wakely <jwakely@redhat.com> + * testsuite/27_io/basic_ios/conv/bool_neg.cc: New. * testsuite/27_io/basic_ios/conv/bool.cc: New. * testsuite/27_io/basic_ios/conv/voidptr.cc: New. diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index 5c3dfae..4eacec3 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()) { |