stl_bvector.h (vector<bool>::erase(iterator, iterator)): Just use _M_erase_at_end.

2006-01-06  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_bvector.h (vector<bool>::erase(iterator,
	iterator)): Just use _M_erase_at_end.

2006-01-06  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_bvector.h (class vector<bool>): Move all the
	helpers under protected access mode, consistently with the primary
	vector template.
	(vector<bool>::_M_erase_at_end): Add.
	(erase(iterator, iterator), clear, resize, _M_fill_assign,
	_M_assign_aux): Use it.
	* testsuite/23_containers/vector/bool/modifiers/erase/1.cc: New.

2006-01-06  Paolo Carlini  <pcarlini@suse.de>

	Implement Option 3 of DR 431 for vector<bool>.
	* include/bits/stl_bvector.h (class _Bvector_base): Change to
	a struct, consistently with the primary vector template.
	(class vector<bool>): Adjust to protected inheritance, tidy
	typedefs.
	(_Bvector_base<>::_M_get_Bit_allocator): Add.
	(vector<bool>::vector(const vector&)): Use it.
	(_Bvector_base<>::get_allocator): Tidy.
	(vector<bool>::swap): Use __alloc_swap.
	* testsuite/23_containers/vector/bool/modifiers/swap/1.cc: New.
	* testsuite/23_containers/vector/bool/modifiers/swap/2.cc: New.

From-SVN: r109415

libstdc++-v3/ChangeLog

+2006-01-06  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/stl_bvector.h (vector<bool>::erase(iterator,
+	iterator)): Just use _M_erase_at_end.
+
+2006-01-06  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/stl_bvector.h (class vector<bool>): Move all the
+	helpers under protected access mode, consistently with the primary
+	vector template.
+	(vector<bool>::_M_erase_at_end): Add.
+	(erase(iterator, iterator), clear, resize, _M_fill_assign,
+	_M_assign_aux): Use it.
+	* testsuite/23_containers/vector/bool/modifiers/erase/1.cc: New.
+
+2006-01-06  Paolo Carlini  <pcarlini@suse.de>
+
+	Implement Option 3 of DR 431 for vector<bool>.
+	* include/bits/stl_bvector.h (class _Bvector_base): Change to
+	a struct, consistently with the primary vector template.
+	(class vector<bool>): Adjust to protected inheritance, tidy
+	typedefs.
+	(_Bvector_base<>::_M_get_Bit_allocator): Add.
+	(vector<bool>::vector(const vector&)): Use it.
+	(_Bvector_base<>::get_allocator): Tidy.
+	(vector<bool>::swap): Use __alloc_swap.
+	* testsuite/23_containers/vector/bool/modifiers/swap/1.cc: New.
+	* testsuite/23_containers/vector/bool/modifiers/swap/2.cc: New.
+
 2006-01-05  Paolo Carlini  <pcarlini@suse.de>
 	
 	* testsuite/testsuite_hooks.h (test_tm(unsigned)): Change to
@@ -32,7 +61,7 @@
 	* testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc: Likewise.
 	* testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc: Likewise.
 	* testsuite/22_locale/time_get/get_monthname/char/1.cc: Likewise.
- 	* testsuite/22_locale/time_get/get_monthname/char/2.cc: Likewise.
+	* testsuite/22_locale/time_get/get_monthname/char/2.cc: Likewise.
 	* testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc: Likewise.
 	* testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc: Likewise.
 	* testsuite/22_locale/time_get/get_weekday/wchar_t/3.cc: Likewise.

libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/erase/1.cc

+// 2005-12-23  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2005, 2006 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.5 vector<bool> modifiers
+
+#include <vector>
+#include <testsuite_hooks.h>
+
+const bool  A[] = {0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1};
+const bool A1[] = {0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1};
+const bool A2[] = {0, 0, 1, 0, 0, 1, 0, 1, 0, 1};
+const bool A3[] = {0, 0, 1, 0, 0, 1};
+const bool A4[] = {0, 0, 1};
+const bool A5[] = {0, 0};
+
+const unsigned  N = sizeof(A)  / sizeof(bool);
+const unsigned N1 = sizeof(A1) / sizeof(bool);
+const unsigned N2 = sizeof(A2) / sizeof(bool);
+const unsigned N3 = sizeof(A3) / sizeof(bool);
+const unsigned N4 = sizeof(A4) / sizeof(bool);
+const unsigned N5 = sizeof(A5) / sizeof(bool);
+
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  typedef std::vector<bool>  vec_type;
+  typedef vec_type::iterator iterator_type;
+
+  vec_type v(A, A + N);
+
+  iterator_type it1 = v.erase(v.begin() + 1);
+  VERIFY( it1 == v.begin() + 1 );
+  VERIFY( v.size() == N1 );
+  VERIFY( std::equal(v.begin(), v.end(), A1) );
+  
+  iterator_type it2 = v.erase(v.begin() + 4, v.begin() + 9);
+  VERIFY( it2 == v.begin() + 4 );
+  VERIFY( v.size() == N2 );
+  VERIFY( std::equal(v.begin(), v.end(), A2) );
+  
+  iterator_type it3 = v.erase(v.begin() + 6, v.end());
+  VERIFY( it3 == v.begin() + 6 );
+  VERIFY( v.size() == N3 );
+  VERIFY( std::equal(v.begin(), v.end(), A3) );
+
+  iterator_type it4 = v.erase(v.begin(), v.begin() + 3);
+  VERIFY( it4 == v.begin() );
+  VERIFY( v.size() == N4 );
+  VERIFY( std::equal(v.begin(), v.end(), A4) );
+
+  iterator_type it5 = v.erase(v.begin() + 2);
+  VERIFY( it5 == v.begin() + 2 );
+  VERIFY( v.size() == N5 );
+  VERIFY( std::equal(v.begin(), v.end(), A5) );
+
+  iterator_type it6 = v.erase(v.begin(), v.end());
+  VERIFY( it6 == v.begin() );
+  VERIFY( v.empty() );
+}
+
+void
+test02()
+{
+  bool test __attribute__((unused)) = true;
+
+  typedef std::vector<std::vector<bool> >  vec_type;
+  typedef vec_type::iterator          iterator_type;
+
+  vec_type v, v1, v2, v3, v4, v5;
+  for (unsigned i = 0; i < N; ++i)
+    v.push_back(std::vector<bool>(1, A[i]));
+  for (unsigned i = 0; i < N1; ++i)
+    v1.push_back(std::vector<bool>(1, A1[i]));
+  for (unsigned i = 0; i < N2; ++i)
+    v2.push_back(std::vector<bool>(1, A2[i]));
+  for (unsigned i = 0; i < N3; ++i)
+    v3.push_back(std::vector<bool>(1, A3[i]));
+  for (unsigned i = 0; i < N4; ++i)
+    v4.push_back(std::vector<bool>(1, A4[i]));
+  for (unsigned i = 0; i < N5; ++i)
+    v5.push_back(std::vector<bool>(1, A5[i]));
+  
+  iterator_type it1 = v.erase(v.begin() + 1);
+  VERIFY( it1 == v.begin() + 1 );
+  VERIFY( v.size() == N1 );
+  VERIFY( std::equal(v.begin(), v.end(), v1.begin()) );
+  
+  iterator_type it2 = v.erase(v.begin() + 4, v.begin() + 9);
+  VERIFY( it2 == v.begin() + 4 );
+  VERIFY( v.size() == N2 );
+  VERIFY( std::equal(v.begin(), v.end(), v2.begin()) );
+  
+  iterator_type it3 = v.erase(v.begin() + 6, v.end());
+  VERIFY( it3 == v.begin() + 6 );
+  VERIFY( v.size() == N3 );
+  VERIFY( std::equal(v.begin(), v.end(), v3.begin()) );
+
+  iterator_type it4 = v.erase(v.begin(), v.begin() + 3);
+  VERIFY( it4 == v.begin() );
+  VERIFY( v.size() == N4 );
+  VERIFY( std::equal(v.begin(), v.end(), v4.begin()) );
+
+  iterator_type it5 = v.erase(v.begin() + 2);
+  VERIFY( it5 == v.begin() + 2 );
+  VERIFY( v.size() == N5 );
+  VERIFY( std::equal(v.begin(), v.end(), v5.begin()) );
+
+  iterator_type it6 = v.erase(v.begin(), v.end());
+  VERIFY( it6 == v.begin() );
+  VERIFY( v.empty() );
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}

libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/1.cc

+// 2005-12-23  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2005, 2006 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.
+
+// 23.2.5 vector<bool>::swap
+
+#include <vector>
+#include <testsuite_hooks.h>
+#include <testsuite_allocator.h>
+
+// uneq_allocator as a non-empty allocator.
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+
+  typedef __gnu_test::uneq_allocator<bool> my_alloc;
+  typedef vector<bool, my_alloc> my_vector;
+
+  const char title01[] = "Rivers of sand";
+  const char title02[] = "Concret PH";
+  const char title03[] = "Sonatas and Interludes for Prepared Piano";
+  const char title04[] = "never as tired as when i'm waking up";
+
+  const size_t N1 = sizeof(title01);
+  const size_t N2 = sizeof(title02);
+  const size_t N3 = sizeof(title03);
+  const size_t N4 = sizeof(title04);
+
+  vector<bool> vec01_ref;
+  for (size_t i = 0; i < N1; ++i)
+    vec01_ref.push_back(bool(title01[i] > 96 ? 1 : 0));
+  vector<bool> vec02_ref;
+  for (size_t i = 0; i < N2; ++i)
+    vec02_ref.push_back(bool(title02[i] > 96 ? 1 : 0));
+  vector<bool> vec03_ref;
+  for (size_t i = 0; i < N3; ++i)
+    vec03_ref.push_back(bool(title03[i] > 96 ? 1 : 0));
+  vector<bool> vec04_ref;
+  for (size_t i = 0; i < N4; ++i)
+    vec04_ref.push_back(bool(title04[i] > 96 ? 1 : 0));
+
+  my_vector::size_type size01, size02;
+
+  my_alloc alloc01(1);
+
+  my_vector vec01(alloc01);
+  size01 = vec01.size();
+  my_vector vec02(alloc01);
+  size02 = vec02.size();
+  
+  vec01.swap(vec02);
+  VERIFY( vec01.size() == size02 );
+  VERIFY( vec01.empty() );
+  VERIFY( vec02.size() == size01 );
+  VERIFY( vec02.empty() );
+
+  my_vector vec03(alloc01);
+  size01 = vec03.size();
+  my_vector vec04(vec02_ref.begin(), vec02_ref.end(), alloc01);
+  size02 = vec04.size();
+  
+  vec03.swap(vec04);
+  VERIFY( vec03.size() == size02 );
+  VERIFY( equal(vec03.begin(), vec03.end(), vec02_ref.begin()) );
+  VERIFY( vec04.size() == size01 );
+  VERIFY( vec04.empty() );
+  
+  my_vector vec05(vec01_ref.begin(), vec01_ref.end(), alloc01);
+  size01 = vec05.size();
+  my_vector vec06(vec02_ref.begin(), vec02_ref.end(), alloc01);
+  size02 = vec06.size();
+  
+  vec05.swap(vec06);
+  VERIFY( vec05.size() == size02 );
+  VERIFY( equal(vec05.begin(), vec05.end(), vec02_ref.begin()) );
+  VERIFY( vec06.size() == size01 );
+  VERIFY( equal(vec06.begin(), vec06.end(), vec01_ref.begin()) );
+
+  my_vector vec07(vec01_ref.begin(), vec01_ref.end(), alloc01);
+  size01 = vec07.size();
+  my_vector vec08(vec03_ref.begin(), vec03_ref.end(), alloc01);
+  size02 = vec08.size();
+
+  vec07.swap(vec08);
+  VERIFY( vec07.size() == size02 );
+  VERIFY( equal(vec07.begin(), vec07.end(), vec03_ref.begin()) );
+  VERIFY( vec08.size() == size01 );
+  VERIFY( equal(vec08.begin(), vec08.end(), vec01_ref.begin()) );
+
+  my_vector vec09(vec03_ref.begin(), vec03_ref.end(), alloc01);
+  size01 = vec09.size();
+  my_vector vec10(vec04_ref.begin(), vec04_ref.end(), alloc01);
+  size02 = vec10.size();
+
+  vec09.swap(vec10);
+  VERIFY( vec09.size() == size02 );
+  VERIFY( equal(vec09.begin(), vec09.end(), vec04_ref.begin()) );
+  VERIFY( vec10.size() == size01 );
+  VERIFY( equal(vec10.begin(), vec10.end(), vec03_ref.begin()) );
+
+  my_vector vec11(vec04_ref.begin(), vec04_ref.end(), alloc01);
+  size01 = vec11.size();
+  my_vector vec12(vec01_ref.begin(), vec01_ref.end(), alloc01);
+  size02 = vec12.size();
+
+  vec11.swap(vec12);
+  VERIFY( vec11.size() == size02 );
+  VERIFY( equal(vec11.begin(), vec11.end(), vec01_ref.begin()) );
+  VERIFY( vec12.size() == size01 );
+  VERIFY( equal(vec12.begin(), vec12.end(), vec04_ref.begin()) );
+
+  my_vector vec13(vec03_ref.begin(), vec03_ref.end(), alloc01);
+  size01 = vec13.size();
+  my_vector vec14(vec03_ref.begin(), vec03_ref.end(), alloc01);
+  size02 = vec14.size();
+
+  vec13.swap(vec14);
+  VERIFY( vec13.size() == size02 );
+  VERIFY( equal(vec13.begin(), vec13.end(), vec03_ref.begin()) );
+  VERIFY( vec14.size() == size01 );
+  VERIFY( equal(vec14.begin(), vec14.end(), vec03_ref.begin()) );
+}
+
+int main()
+{ 
+  test01();
+  return 0;
+}

libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/2.cc

+// 2005-12-23  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2005, 2006 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.
+
+// 23.2.5 vector<bool>::swap
+
+#include <vector>
+#include <testsuite_hooks.h>
+#include <testsuite_allocator.h>
+
+// uneq_allocator, two different personalities.
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+
+  typedef __gnu_test::uneq_allocator<bool> my_alloc;
+  typedef vector<bool, my_alloc> my_vector;
+
+  const char title01[] = "Rivers of sand";
+  const char title02[] = "Concret PH";
+  const char title03[] = "Sonatas and Interludes for Prepared Piano";
+  const char title04[] = "never as tired as when i'm waking up";
+
+  const size_t N1 = sizeof(title01);
+  const size_t N2 = sizeof(title02);
+  const size_t N3 = sizeof(title03);
+  const size_t N4 = sizeof(title04);
+
+  vector<bool> vec01_ref;
+  for (size_t i = 0; i < N1; ++i)
+    vec01_ref.push_back(bool(title01[i] > 96 ? 1 : 0));
+  vector<bool> vec02_ref;
+  for (size_t i = 0; i < N2; ++i)
+    vec02_ref.push_back(bool(title02[i] > 96 ? 1 : 0));
+  vector<bool> vec03_ref;
+  for (size_t i = 0; i < N3; ++i)
+    vec03_ref.push_back(bool(title03[i] > 96 ? 1 : 0));
+  vector<bool> vec04_ref;
+  for (size_t i = 0; i < N4; ++i)
+    vec04_ref.push_back(bool(title04[i] > 96 ? 1 : 0));
+
+  my_vector::size_type size01, size02;
+
+  my_alloc alloc01(1), alloc02(2);
+  int personality01, personality02;
+
+  my_vector vec01(alloc01);
+  size01 = vec01.size();
+  personality01 = vec01.get_allocator().get_personality();
+  my_vector vec02(alloc02);
+  size02 = vec02.size();
+  personality02 = vec02.get_allocator().get_personality();
+
+  vec01.swap(vec02);
+  VERIFY( vec01.size() == size02 );
+  VERIFY( vec01.empty() );
+  VERIFY( vec02.size() == size01 );
+  VERIFY( vec02.empty() );
+  VERIFY( vec01.get_allocator().get_personality() == personality02 );
+  VERIFY( vec02.get_allocator().get_personality() == personality01 );
+
+  my_vector vec03(alloc02);
+  size01 = vec03.size();
+  personality01 = vec03.get_allocator().get_personality();
+  my_vector vec04(vec02_ref.begin(), vec02_ref.end(), alloc01);
+  size02 = vec04.size();
+  personality02 = vec04.get_allocator().get_personality();
+
+  vec03.swap(vec04);
+  VERIFY( vec03.size() == size02 );
+  VERIFY( equal(vec03.begin(), vec03.end(), vec02_ref.begin()) );
+  VERIFY( vec04.size() == size01 );
+  VERIFY( vec04.empty() );
+  VERIFY( vec03.get_allocator().get_personality() == personality02 );
+  VERIFY( vec04.get_allocator().get_personality() == personality01 );
+  
+  my_vector vec05(vec01_ref.begin(), vec01_ref.end(), alloc01);
+  size01 = vec05.size();
+  personality01 = vec05.get_allocator().get_personality();
+  my_vector vec06(vec02_ref.begin(), vec02_ref.end(), alloc02);
+  size02 = vec06.size();
+  personality02 = vec06.get_allocator().get_personality();
+
+  vec05.swap(vec06);
+  VERIFY( vec05.size() == size02 );
+  VERIFY( equal(vec05.begin(), vec05.end(), vec02_ref.begin()) );
+  VERIFY( vec06.size() == size01 );
+  VERIFY( equal(vec06.begin(), vec06.end(), vec01_ref.begin()) );
+  VERIFY( vec05.get_allocator().get_personality() == personality02 );
+  VERIFY( vec06.get_allocator().get_personality() == personality01 );
+
+  my_vector vec07(vec01_ref.begin(), vec01_ref.end(), alloc02);
+  size01 = vec07.size();
+  personality01 = vec07.get_allocator().get_personality();
+  my_vector vec08(vec03_ref.begin(), vec03_ref.end(), alloc01);
+  size02 = vec08.size();
+  personality02 = vec08.get_allocator().get_personality();
+
+  vec07.swap(vec08);
+  VERIFY( vec07.size() == size02 );
+  VERIFY( equal(vec07.begin(), vec07.end(), vec03_ref.begin()) );
+  VERIFY( vec08.size() == size01 );
+  VERIFY( equal(vec08.begin(), vec08.end(), vec01_ref.begin()) );
+  VERIFY( vec07.get_allocator().get_personality() == personality02 );
+  VERIFY( vec08.get_allocator().get_personality() == personality01 );
+
+  my_vector vec09(vec03_ref.begin(), vec03_ref.end(), alloc01);
+  size01 = vec09.size();
+  personality01 = vec09.get_allocator().get_personality();
+  my_vector vec10(vec04_ref.begin(), vec04_ref.end(), alloc02);
+  size02 = vec10.size();
+  personality02 = vec10.get_allocator().get_personality();
+
+  vec09.swap(vec10);
+  VERIFY( vec09.size() == size02 );
+  VERIFY( equal(vec09.begin(), vec09.end(), vec04_ref.begin()) );
+  VERIFY( vec10.size() == size01 );
+  VERIFY( equal(vec10.begin(), vec10.end(), vec03_ref.begin()) );
+  VERIFY( vec09.get_allocator().get_personality() == personality02 );
+  VERIFY( vec10.get_allocator().get_personality() == personality01 );
+
+  my_vector vec11(vec04_ref.begin(), vec04_ref.end(), alloc02);
+  size01 = vec11.size();
+  personality01 = vec11.get_allocator().get_personality();
+  my_vector vec12(vec01_ref.begin(), vec01_ref.end(), alloc01);
+  size02 = vec12.size();
+  personality02 = vec12.get_allocator().get_personality();
+
+  vec11.swap(vec12);
+  VERIFY( vec11.size() == size02 );
+  VERIFY( equal(vec11.begin(), vec11.end(), vec01_ref.begin()) );
+  VERIFY( vec12.size() == size01 );
+  VERIFY( equal(vec12.begin(), vec12.end(), vec04_ref.begin()) );
+  VERIFY( vec11.get_allocator().get_personality() == personality02 );
+  VERIFY( vec12.get_allocator().get_personality() == personality01 );
+
+  my_vector vec13(vec03_ref.begin(), vec03_ref.end(), alloc01);
+  size01 = vec13.size();
+  personality01 = vec13.get_allocator().get_personality();
+  my_vector vec14(vec03_ref.begin(), vec03_ref.end(), alloc02);
+  size02 = vec14.size();
+  personality02 = vec14.get_allocator().get_personality();
+
+  vec13.swap(vec14);
+  VERIFY( vec13.size() == size02 );
+  VERIFY( equal(vec13.begin(), vec13.end(), vec03_ref.begin()) );
+  VERIFY( vec14.size() == size01 );
+  VERIFY( equal(vec14.begin(), vec14.end(), vec03_ref.begin()) );
+  VERIFY( vec13.get_allocator().get_personality() == personality02 );
+  VERIFY( vec14.get_allocator().get_personality() == personality01 );
+}
+
+int main()
+{ 
+  test01();
+  return 0;
+}