diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2006-09-22 17:51:01 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2006-09-22 17:51:01 +0000 |
| commit | 3b83e64bd3b0c9b9c69fc94276f88171e1376772 (patch) | |
| tree | c7db9dca7c102d02d449f68128c233d7da326385 | |
| parent | dcd400b56f01dd6429d78f1f187e4ab575424542 (diff) | |
| download | gcc-3b83e64bd3b0c9b9c69fc94276f88171e1376772.zip gcc-3b83e64bd3b0c9b9c69fc94276f88171e1376772.tar.gz gcc-3b83e64bd3b0c9b9c69fc94276f88171e1376772.tar.bz2 | |
PR libstdc++/29134 (vector<bool> bits)
2006-09-22 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/29134 (vector<bool> bits)
* include/bits/stl_bvector.h (vector<bool>::max_size):
Use allocator' max_size.
* testsuite/23_containers/vector/bool/capacity/29134.cc: New.
* testsuite/23_containers/deque/capacity/29134-2.cc: Minor tweak.
* testsuite/23_containers/vector/capacity/29134-2.cc: Likewise.
From-SVN: r117148
5 files changed, 55 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 425349e..d1650f0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,15 @@ 2006-09-22 Paolo Carlini <pcarlini@suse.de> + PR libstdc++/29134 (vector<bool> bits) + * include/bits/stl_bvector.h (vector<bool>::max_size): + Use allocator' max_size. + * testsuite/23_containers/vector/bool/capacity/29134.cc: New. + + * testsuite/23_containers/deque/capacity/29134-2.cc: Minor tweak. + * testsuite/23_containers/vector/capacity/29134-2.cc: Likewise. + +2006-09-22 Paolo Carlini <pcarlini@suse.de> + * include/tr1/type_traits (add_reference): Robustify vs reference to void. * testsuite/tr1/4_metaprogramming/reference_modifications/ diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index a48e964..9dc2656 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -581,7 +581,11 @@ template<typename _Alloc> size_type max_size() const - { return size_type(-1); } + { + const size_type __asize = _M_get_Bit_allocator().max_size(); + return (__asize <= size_type(-1) / int(_S_word_bit) ? + __asize * int(_S_word_bit) : size_type(-1)); + } size_type capacity() const diff --git a/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc b/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc index bce8f91..ce709f6 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc @@ -20,7 +20,6 @@ #include <deque> #include <stdexcept> -#include <limits> #include <testsuite_hooks.h> // libstdc++/29134 @@ -33,7 +32,7 @@ void test01() try { - d.resize(numeric_limits<size_t>::max()); + d.resize(size_t(-1)); } catch(const std::length_error&) { diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc new file mode 100644 index 0000000..4290c86 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc @@ -0,0 +1,38 @@ +// Copyright (C) 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 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 23.2.5 class vector<bool> [lib.vector.bool] + +#include <vector> +#include <testsuite_hooks.h> + +// libstdc++/29134 +void test01() +{ + bool test __attribute__((unused)) = true; + + std::vector<bool> vb; + + VERIFY( vb.max_size() == std::vector<bool>::size_type(-1) ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc index 79a1d24..0ac2227 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc @@ -20,7 +20,6 @@ #include <vector> #include <stdexcept> -#include <limits> #include <testsuite_hooks.h> // libstdc++/29134 @@ -33,7 +32,7 @@ void test01() try { - v.resize(numeric_limits<size_t>::max()); + v.resize(size_t(-1)); } catch(const std::length_error&) { |