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

re PR libstdc++/20577 (iter_swap doesn't work anymore with vector<bool>)

Browse source 
2005-03-21  Chris Jefferson  <chris@bubblescope.net>

	PR libstdc++/20577
	* include/bits/stl_algobase.h (iter_swap): Only delegate iter_swap
	to swap when the iterator's reference_type is a reference to its
	value_type.
	* testsuite/25_algorithms/iter_swap/20577.cc: New.

From-SVN: r96837
This commit is contained in:
Chris Jefferson 2005-03-21 22:16:15 +00:00 • committed by Paolo Carlini
parent ffaf4d3b13
commit aed63147cb
3 changed files with 87 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,11 @@
2005-03-21 Chris Jefferson <chris@bubblescope.net>
PR libstdc++/20577
* include/bits/stl_algobase.h (iter_swap): Only delegate iter_swap
to swap when the iterator's reference_type is a reference to its
value_type.
* testsuite/25_algorithms/iter_swap/20577.cc: New.
2005-03-21 Zack Weinberg <zack@codesourcery.com>
* acinclude.m4 (GLIBCXX_CONFIGURE): Delete gcc_version logic.

9
libstdc++-v3/include/bits/stl_algobase.h
View file

@ -155,7 +155,14 @@ namespace std
_ValueType2>)
__glibcxx_function_requires(_ConvertibleConcept<_ValueType2,
_ValueType1>)
std::__iter_swap<__are_same<_ValueType1, _ValueType2>::__value>::
typedef typename iterator_traits<_ForwardIterator1>::reference
_ReferenceType1;
typedef typename iterator_traits<_ForwardIterator2>::reference
_ReferenceType2;
std::__iter_swap<__are_same<_ValueType1, _ValueType2>::__value &&
__are_same<_ValueType1 &, _ReferenceType1>::__value &&
__are_same<_ValueType2 &, _ReferenceType2>::__value>::
iter_swap(__a, __b);
}

71
libstdc++-v3/testsuite/25_algorithms/iter_swap/20577.cc Normal file
View file

@ -0,0 +1,71 @@
// Copyright (C) 2005 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
#include <algorithm>
#include <vector>
#include <testsuite_hooks.h>
void
test1()
{
bool test __attribute__((unused)) = true;
std::vector<bool> v;
v.push_back(true);
v.push_back(false);
std::iter_swap(v.begin(), v.begin() + 1);
VERIFY( v[0] == false && v[1] == true );
}
void
test2()
{
bool test __attribute__((unused)) = true;
std::vector<int> v;
v.push_back(1);
v.push_back(2);
std::iter_swap(v.begin(), v.begin() + 1);
VERIFY( v[0] == 2 && v[1] == 1 );
}
int int_swap_count;
struct X {};
void swap(X& i, X& j)
{ ++int_swap_count; }
void
test3()
{
bool test __attribute__((unused)) = true;
int_swap_count = 0;
X i, j;
std::iter_swap(&i, &j);
VERIFY( int_swap_count == 1 );
}
// libstdc++/20577
int main()
{
test1();
test2();
test3();
return 0;
}