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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
