svn commit: r236539 - stable/9/contrib/libc++/include

Dimitry Andric dim at FreeBSD.org
Mon Jun 4 06:43:01 UTC 2012


Author: dim
Date: Mon Jun  4 06:43:01 2012
New Revision: 236539
URL: http://svn.freebsd.org/changeset/base/236539

Log:
  MFC r236387:
  
  Fix dangling else in libc++'s __bit_reference header.  This has also
  been sent upstream.

Modified:
  stable/9/contrib/libc++/include/__bit_reference
Directory Properties:
  stable/9/contrib/libc++/   (props changed)

Modified: stable/9/contrib/libc++/include/__bit_reference
==============================================================================
--- stable/9/contrib/libc++/include/__bit_reference	Mon Jun  4 06:39:10 2012	(r236538)
+++ stable/9/contrib/libc++/include/__bit_reference	Mon Jun  4 06:43:01 2012	(r236539)
@@ -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;


More information about the svn-src-stable-9 mailing list