aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2025-03-21 22:49:44 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2025-03-24 11:34:49 +0000
commit75df481fcc381d6aaefdbe2ef1d66927e30b5743 (patch)
tree2be9a2780c2e6535cd6021df809c6f3ba0b26580
parentbeec790e2b5d55058c4323731ccffd07c203fd71 (diff)
downloadgcc-75df481fcc381d6aaefdbe2ef1d66927e30b5743.zip
gcc-75df481fcc381d6aaefdbe2ef1d66927e30b5743.tar.gz
gcc-75df481fcc381d6aaefdbe2ef1d66927e30b5743.tar.bz2
libstdc++: Ensure that std::vector<bool> allocator has bool value_type
This is the subject of LWG 4228 which notes that libstdc++ doesn't enforce this requirement. That's just a bug because I forgot to add it to vector<bool> when adding it elsewhere. For consistency with the other containers we should not allow incorrect allocator types for strict -std=c++NN modes, but it is very late to make that change for GCC 15 so this only enables the assertion for C++20 (where it's required). For GCC 16 we can enable it for strict modes too. libstdc++-v3/ChangeLog: * include/bits/stl_bvector.h (vector<bool, A>): Enforce the C++20 requirement that the allocator's value_type matches the container. * testsuite/23_containers/vector/bool/cons/from_range.cc: Fix incorrect allocator type. Reviewed-by: Tomasz KamiƄski <tkaminsk@redhat.com>
-rw-r--r--libstdc++-v3/include/bits/stl_bvector.h4
-rw-r--r--libstdc++-v3/testsuite/23_containers/vector/bool/cons/from_range.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index 2292eec..3ee15ea 100644
--- a/libstdc++-v3/include/bits/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
@@ -751,6 +751,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#if __cplusplus >= 201103L
friend struct std::hash<vector>;
+# if __cplusplus > 201703L // || defined __STRICT_ANSI__
+ static_assert(is_same<typename _Alloc::value_type, bool>::value,
+ "std::vector must have the same value_type as its allocator");
+# endif
#endif
public:
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/from_range.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/from_range.cc
index f531e7f..37f0ecf 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/from_range.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/from_range.cc
@@ -71,7 +71,7 @@ test_ranges()
bool val;
};
using rvalue_input_range = test_range<C, input_iterator_wrapper_rval>;
- do_test<rvalue_input_range>(std::allocator<int>());
+ do_test<rvalue_input_range>(std::allocator<bool>());
return true;
}