[libc++][C++03] cherry-pick #119801 (#158247)

philnik777 · web-flow · commit 2a0d7f8a83c8 · 2025-09-24T10:56:12.000+02:00
diff --git a/libcxx/include/__cxx03/vector b/libcxx/include/__cxx03/vector
@@ -1891,7 +1891,7 @@ vector<bool, _Allocator>::__recommend(size_type __new_size) const {
   const size_type __cap = capacity();
   if (__cap >= __ms / 2)
     return __ms;
-  return std::max(2 * __cap, __align_it(__new_size));
+  return std::max<size_type>(2 * __cap, __align_it(__new_size));
 }
 
 //  Default constructs __n objects starting at __end_
diff --git a/libcxx/test/std/containers/sequences/vector.bool/small_allocator_size.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/small_allocator_size.pass.cpp
@@ -9,8 +9,6 @@
 // <vector>
 // vector<bool>
 
-// XFAIL: FROZEN-CXX03-HEADERS-FIXME
-
 // This test ensures that std::vector<bool> handles allocator types with small size types
 // properly. Related issue: https://llvm.org/PR121713.
 

Original file line number	Diff line number	Diff line change
`@@ -1891,7 +1891,7 @@ vector<bool, _Allocator>::__recommend(size_type __new_size) const {`
`1891`	`1891`	`const size_type __cap = capacity();`
`1892`	`1892`	`if (__cap >= __ms / 2)`
`1893`	`1893`	`return __ms;`
`1894`		`- return std::max(2 * __cap, __align_it(__new_size));`
	`1894`	`+ return std::max<size_type>(2 * __cap, __align_it(__new_size));`
`1895`	`1895`	`}`
`1896`	`1896`
`1897`	`1897`	`// Default constructs __n objects starting at __end_`