From 815a6cc1e325a4e8596b91756039a7d699471b11 Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 27 Apr 2013 22:47:52 +0000 Subject: Merge libc++ trunk r180598. Contains several minor cleanups and bug fixes, no major changes. MFC after: 2 weeks --- contrib/libc++/include/algorithm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/libc++/include/algorithm') diff --git a/contrib/libc++/include/algorithm b/contrib/libc++/include/algorithm index e24f979..39191db 100644 --- a/contrib/libc++/include/algorithm +++ b/contrib/libc++/include/algorithm @@ -1398,7 +1398,7 @@ __search_n(_RandomAccessIterator __first, _RandomAccessIterator __last, // Find first element in sequence that matchs __value_, with a mininum of loop checks while (true) { - if (__first == __s) // return __last if no element matches __value_ + if (__first >= __s) // return __last if no element matches __value_ return __last; if (__pred(*__first, __value_)) break; @@ -2764,7 +2764,7 @@ class __rs_default __rs_default(); public: - typedef unsigned result_type; + typedef uint_fast32_t result_type; static const result_type _Min = 0; static const result_type _Max = 0xFFFFFFFF; -- cgit v1.1