procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deque.tcc (deque<>::erase(iterator, iterator)): Fix condition.

Browse source 
2007-01-24   Steve LoBasso <slobasso@yahoo.com>
	     Paolo Carlini  <pcarlini@suse.de>

	* include/bits/deque.tcc (deque<>::erase(iterator, iterator)):
	Fix condition.
	* testsuite/23_containers/deque/modifiers/erase/3.cc: New.

Co-Authored-By: Paolo Carlini <pcarlini@suse.de>

From-SVN: r121147
This commit is contained in:
Steve LoBasso 2007-01-24 23:52:37 +00:00 • committed by Paolo Carlini
parent 3e2a6e7bd2
commit 45dc23a66b
3 changed files with 61 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,10 @@
2007-01-24 Steve LoBasso <slobasso@yahoo.com>
Paolo Carlini <pcarlini@suse.de>
* include/bits/deque.tcc (deque<>::erase(iterator, iterator)):
Fix condition.
* testsuite/23_containers/deque/modifiers/erase/3.cc: New.
2007-01-24 Andrew Pinski <andrew_pinski@playstation.sony.com>
* libsupc++/eh_personality.cc (PERSONALITY_FUNCTION): Replace

4
libstdc++-v3/include/bits/deque.tcc
View file

@ -1,6 +1,6 @@
// Deque implementation (out of line) -*- C++ -*-
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -143,7 +143,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD)
{
const difference_type __n = __last - __first;
const difference_type __elems_before = __first - begin();
if (static_cast<size_type>(__elems_before) < (size() - __n) / 2)
if (static_cast<size_type>(__elems_before) <= (size() - __n) / 2)
{
if (__first != begin())
std::copy_backward(begin(), __first, __last);

52
libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc Normal file
View file

@ -0,0 +1,52 @@
// Copyright (C) 2007 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 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even 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 COPYING. If not, write to the Free
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// 23.2.1.3 deque modifiers
#include <deque>
#include <testsuite_hooks.h>
void erase(size_t num_elm, size_t elm_strt, size_t elm_end)
{
bool test __attribute__((unused)) = true;
using __gnu_test::copy_tracker;
using __gnu_test::assignment_operator;
std::deque<copy_tracker> x(num_elm);
copy_tracker::reset();
x.erase(x.begin() + elm_strt, x.begin() + elm_end);
const size_t min_num_cpy = std::min(elm_strt, num_elm - elm_end);
VERIFY( assignment_operator::count() == min_num_cpy );
}
// http://gcc.gnu.org/ml/libstdc++/2007-01/msg00098.html
void test01()
{
for (size_t num_elm = 0; num_elm <= 10; ++num_elm)
for (size_t elm_strt = 0; elm_strt <= num_elm; ++elm_strt)
for (size_t elm_end = elm_strt; elm_end <= num_elm; ++elm_end)
erase(num_elm, elm_strt, elm_end);
}
int main()
{
test01();
return 0;
}