Date: Fri, 1 Jun 2012 06:55:02 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r236387 - head/contrib/libc++/include Message-ID: <201206010655.q516t2gU093370@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Fri Jun 1 06:55:01 2012 New Revision: 236387 URL: http://svn.freebsd.org/changeset/base/236387 Log: Fix dangling else in libc++'s __bit_reference header. This has also been sent upstream. MFC after: 3 days Modified: head/contrib/libc++/include/__bit_reference Modified: head/contrib/libc++/include/__bit_reference ============================================================================== --- head/contrib/libc++/include/__bit_reference Fri Jun 1 06:50:37 2012 (r236386) +++ head/contrib/libc++/include/__bit_reference Fri Jun 1 06:55:01 2012 (r236387) @@ -950,11 +950,15 @@ __equal_unaligned(__bit_iterator<_Cp, tr __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r); __m = (~__storage_type(0) << __first2.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn)); if (__first2.__ctz_ > __first1.__ctz_) + { if ((*__first2.__seg_ & __m) != (__b << (__first2.__ctz_ - __first1.__ctz_))) return false; + } else + { if ((*__first2.__seg_ & __m) != (__b >> (__first1.__ctz_ - __first2.__ctz_))) return false; + } __first2.__seg_ += (__ddn + __first2.__ctz_) / __bits_per_word; __first2.__ctz_ = static_cast<unsigned>((__ddn + __first2.__ctz_) % __bits_per_word); __dn -= __ddn;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206010655.q516t2gU093370>