conditional around vector<bool>

lnkuiper · Sep 5, 2024 · a164856 · a164856
1 parent 5851198
commit a164856
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/include/duckdb/common/stl_allocator.hpp b/src/include/duckdb/common/stl_allocator.hpp
@@ -110,9 +110,29 @@ bool operator==(const stl_allocator<T> &, const stl_allocator<U> &) noexcept {
 	return true;
 }
 
+template <class T, class U>
+bool operator==(stl_allocator<T> &, const stl_allocator<U> &) noexcept {
+	return true;
+}
+
+template <class T, class U>
+bool operator==(const stl_allocator<T> &, stl_allocator<U> &) noexcept {
+	return true;
+}
+
 template <class T, class U>
 bool operator!=(const stl_allocator<T> &, const stl_allocator<U> &) noexcept {
 	return false;
 }
 
+template <class T, class U>
+bool operator!=(stl_allocator<T> &, const stl_allocator<U> &) noexcept {
+	return false;
+}
+
+template <class T, class U>
+bool operator!=(const stl_allocator<T> &, stl_allocator<U> &) noexcept {
+	return false;
+}
+
 } // namespace duckdb
diff --git a/src/include/duckdb/common/vector.hpp b/src/include/duckdb/common/vector.hpp
@@ -28,10 +28,12 @@ void ThrowEraseAtException(duckdb::idx_t index, duckdb::idx_t size);
 
 namespace duckdb {
 
-template <class DATA_TYPE, bool SAFE = true>
-class vector : public std::vector<DATA_TYPE, stl_allocator<DATA_TYPE>> { // NOLINT: matching name of std
+template <class DATA_TYPE, bool SAFE = true, // vector<bool> is evil so we work around it
+          class ALLOCATOR = typename std::conditional<std::is_same<DATA_TYPE, bool>::value, std::allocator<DATA_TYPE>,
+                                                      stl_allocator<DATA_TYPE>>::type>
+class vector : public std::vector<DATA_TYPE, ALLOCATOR> { // NOLINT: matching name of std
 public:
-	using original = std::vector<DATA_TYPE, stl_allocator<DATA_TYPE>>;
+	using original = std::vector<DATA_TYPE, ALLOCATOR>;
 	using original::original;
 	using size_type = typename original::size_type;
 	using const_reference = typename original::const_reference;