mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-03 07:10:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

allocator.h (__shrink_to_fit_aux::_S_do_it): Create the new object with the same allocator.

Browse Source 
* include/bits/allocator.h (__shrink_to_fit_aux::_S_do_it): Create
	the new object with the same allocator.
	* testsuite/23_containers/vector/capacity/shrink_to_fit2.cc: New.

From-SVN: r181235
This commit is contained in:
Jonathan Wakely 2011-11-09 21:14:03 +00:00 committed by Jonathan Wakely
parent e14304eff5
commit 5ed56cbbee
3 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2011-11-09 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/bits/allocator.h (__shrink_to_fit_aux::_S_do_it): Create
the new object with the same allocator.
* testsuite/23_containers/vector/capacity/shrink_to_fit2.cc: New.
2011-11-09 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/profile/unordered_map: Add missing copy constructors.

3
libstdc++-v3/include/bits/allocator.h
View File

@ -198,7 +198,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__try
{
_Tp(__make_move_if_noexcept_iterator(__c.begin()),
__make_move_if_noexcept_iterator(__c.end())).swap(__c);
__make_move_if_noexcept_iterator(__c.end()),
__c.get_allocator()).swap(__c);
return true;
}
__catch(...)

61
libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit2.cc Normal file
View File

@ -0,0 +1,61 @@
// { dg-options "-std=gnu++0x" }
// Copyright (C) 2011 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without Pred the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
#include <vector>
#include <testsuite_hooks.h>
#include <testsuite_allocator.h>
using __gnu_test::propagating_allocator;
void test01()
{
bool test __attribute__((unused)) = true;
typedef propagating_allocator<int, true> alloc_type;
alloc_type alloc(5);
std::vector<int, alloc_type> v(10u, 1, alloc);
v.reserve(100);
VERIFY( v.size() < v.capacity() );
v.shrink_to_fit();
VERIFY( v.size() == v.capacity() );
VERIFY( v.get_allocator().get_personality() == alloc.get_personality() );
}
void test02()
{
bool test __attribute__((unused)) = true;
typedef propagating_allocator<int, false> alloc_type;
alloc_type alloc(5);
std::vector<int, alloc_type> v(10u, 1, alloc);
v.reserve(100);
VERIFY( v.size() < v.capacity() );
v.shrink_to_fit();
VERIFY( v.size() == v.capacity() );
VERIFY( v.get_allocator().get_personality() == alloc.get_personality() );
}
int main()
{
test01();
test02();
return 0;
}