[libc++] Fix build issues with find

llvm · Jul 25, 2024 · a997ee5 · a997ee5
1 parent d3da2a7
commit a997ee5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/libcxx/include/__algorithm/find.h b/libcxx/include/__algorithm/find.h
@@ -104,7 +104,7 @@ __find_bool(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
   // do first partial word
   if (__first.__ctz_ != 0) {
     __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-    __storage_type __dn    = std::min(__clz_f, __n);
+    __storage_type __dn    = (__clz_f < __n) ? __clz_f : __n;
     __storage_type __m     = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
     __storage_type __b     = std::__invert_if<!_ToFind>(*__first.__seg_) & __m;
     if (__b)

diff --git a/libcxx/include/__algorithm/min_element.h b/libcxx/include/__algorithm/min_element.h
@@ -11,6 +11,7 @@
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
+#include <__algorithm/find.h>
 #include <__algorithm/iterator_operations.h>
 #include <__config>
 #include <__functional/identity.h>
@@ -83,7 +84,7 @@ __min_element(_Iter __first, _Sent __last, _Comp __comp, _Proj& __proj) {
     __block_end   = __last;
   }
 
-  return find(__block_start, __block_end, __min_val);
+  return std::__find(__block_start, __block_end, __min_val, __proj);
 }
 
 template <class _Comp, class _Iter, class _Sent>