aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/debug/deque
diff options
context:
space:
mode:
authorFrançois Dumont <francois.cppdevs@free.fr>2011-06-12 17:51:36 +0200
committerPaolo Carlini <paolo@gcc.gnu.org>2011-06-12 15:51:36 +0000
commit8a752dfea6f512ecb19a7f2fd535b8862ef3dbe2 (patch)
tree35ec9f7a850f39851d2e1c34a6db9f76d61e6e77 /libstdc++-v3/include/debug/deque
parent0a7aa509afa59aa494c75f3ff7f285895800d538 (diff)
downloadgcc-8a752dfea6f512ecb19a7f2fd535b8862ef3dbe2.zip
gcc-8a752dfea6f512ecb19a7f2fd535b8862ef3dbe2.tar.gz
gcc-8a752dfea6f512ecb19a7f2fd535b8862ef3dbe2.tar.bz2
allocator.h (__shrink_to_fit): Rename to __shrink_to_fit_aux, fix.
2011-06-12 François Dumont <francois.cppdevs@free.fr> Paolo Carlini <paolo.carlini@oracle.com> * include/bits/allocator.h (__shrink_to_fit): Rename to __shrink_to_fit_aux, fix. * include/bits/stl_vector.h (_M_shrink_to_fit): Declare. (shrink_to_fit): Use the latter. * include/debug/vector (shrink_to_fit): Likewise. * include/bits/vector.tcc (_M_shrink_to_fit): Define. * include/bits/stl_deque.h (_M_shrink_to_fit): Declare. (shrink_to_fit): Use the latter. * include/debug/deque (shrink_to_fit): Likewise. * include/bits/deque.tcc (_M_shrink_to_fit): Define. * include/bits/vector.tcc (vector<bool>::_M_reallocate): Add. * include/bits/stl_bvector.h (_M_shrink_to_fit): Declare. (shrink_to_fit): Use the latter. (reserve): Use _M_reallocate, move inline. (_Bvector_base<>::_S_nword): Add, use it throughout. * include/debug/string (shrink_to_fit): Redo. * include/ext/vstring.h (shrink_to_fit): Optimize. * include/bits/basic_string.h (shrink_to_fit): Likewise. * testsuite/21_strings/debug/shrink_to_fit.cc: New. * testsuite/23_containers/vector/debug/shrink_to_fit.cc: Likewise. * testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc: Likewise. * testsuite/23_containers/vector/bool/capacity/shrink_to_fit.cc: Likewise. * testsuite/23_containers/deque/debug/shrink_to_fit.cc: Likewise. Co-Authored-By: Paolo Carlini <paolo.carlini@oracle.com> From-SVN: r174967
Diffstat (limited to 'libstdc++-v3/include/debug/deque')
-rw-r--r--libstdc++-v3/include/debug/deque7
1 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/include/debug/deque b/libstdc++-v3/include/debug/deque
index 749fc2e..5b6bdeb 100644
--- a/libstdc++-v3/include/debug/deque
+++ b/libstdc++-v3/include/debug/deque
@@ -277,7 +277,12 @@ namespace __debug
#endif
#ifdef __GXX_EXPERIMENTAL_CXX0X__
- using _Base::shrink_to_fit;
+ void
+ shrink_to_fit()
+ {
+ if (_Base::_M_shrink_to_fit())
+ this->_M_invalidate_all();
+ }
#endif
using _Base::empty;