[libcxx] r212046 - Fix a typo in the noexcept calculation for __compressed_pair::swap. Thanks to EricWF for the bug report and the fix.

[Eric Fiselier]

Yes, There was a sample test case on the code review page under test plan.

http://reviews.llvm.org/D4330

Eric

On Mon, Jun 30, 2014 at 9:53 AM, Hal Finkel <hfinkel at anl.gov> wrote:

> ----- Original Message -----
> > From: "Marshall Clow" <mclow.lists at gmail.com>
> > To: cfe-commits at cs.uiuc.edu
> > Sent: Monday, June 30, 2014 10:35:09 AM
> > Subject: [libcxx] r212046 - Fix a typo in the noexcept calculation for
>      __compressed_pair::swap. Thanks to EricWF for
> > the bug report and the        fix.
> >
> > Author: marshall
> > Date: Mon Jun 30 10:35:09 2014
> > New Revision: 212046
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=212046&view=rev
> > Log:
> > Fix a typo in the noexcept calculation for __compressed_pair::swap.
> > Thanks to EricWF for the bug report and the fix.
>
> This is testable, right?
>
>  -Hal
>
> >
> > Modified:
> >     libcxx/trunk/include/memory
> >
> > Modified: libcxx/trunk/include/memory
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/memory?rev=212046&r1=212045&r2=212046&view=diff
> >
> ==============================================================================
> > --- libcxx/trunk/include/memory (original)
> > +++ libcxx/trunk/include/memory Mon Jun 30 10:35:09 2014
> > @@ -2019,7 +2019,7 @@ public:
> >
> >      _LIBCPP_INLINE_VISIBILITY void
> >      swap(__libcpp_compressed_pair_imp& __x)
> >          _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
> > -                   __is_nothrow_swappable<_T1>::value)
> > +                   __is_nothrow_swappable<_T2>::value)
> >      {
> >          using _VSTD::swap;
> >          swap(__first_, __x.__first_);
> > @@ -2110,7 +2110,7 @@ public:
> >
> >      _LIBCPP_INLINE_VISIBILITY void
> >      swap(__libcpp_compressed_pair_imp& __x)
> >          _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
> > -                   __is_nothrow_swappable<_T1>::value)
> > +                   __is_nothrow_swappable<_T2>::value)
> >      {
> >          using _VSTD::swap;
> >          swap(__second_, __x.__second_);
> > @@ -2203,7 +2203,7 @@ public:
> >
> >      _LIBCPP_INLINE_VISIBILITY void
> >      swap(__libcpp_compressed_pair_imp& __x)
> >          _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
> > -                   __is_nothrow_swappable<_T1>::value)
> > +                   __is_nothrow_swappable<_T2>::value)
> >      {
> >          using _VSTD::swap;
> >          swap(__first_, __x.__first_);
> > @@ -2292,7 +2292,7 @@ public:
> >
> >      _LIBCPP_INLINE_VISIBILITY void
> >      swap(__libcpp_compressed_pair_imp&)
> >          _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
> > -                   __is_nothrow_swappable<_T1>::value)
> > +                   __is_nothrow_swappable<_T2>::value)
> >      {
> >      }
> >  };
> > @@ -2375,7 +2375,7 @@ public:
> >
> >      _LIBCPP_INLINE_VISIBILITY void swap(__compressed_pair& __x)
> >          _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
> > -                   __is_nothrow_swappable<_T1>::value)
> > +                   __is_nothrow_swappable<_T2>::value)
> >          {base::swap(__x);}
> >  };
> >
> > @@ -2384,7 +2384,7 @@ inline _LIBCPP_INLINE_VISIBILITY
> >  void
> >  swap(__compressed_pair<_T1, _T2>& __x, __compressed_pair<_T1, _T2>&
> >  __y)
> >          _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
> > -                   __is_nothrow_swappable<_T1>::value)
> > +                   __is_nothrow_swappable<_T2>::value)
> >      {__x.swap(__y);}
> >
> >  // __same_or_less_cv_qualified
> >
> >
> > _______________________________________________
> > cfe-commits mailing list
> > cfe-commits at cs.uiuc.edu
> > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
> >
>
> --
> Hal Finkel
> Assistant Computational Scientist
> Leadership Computing Facility
> Argonne National Laboratory
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140630/a134978f/attachment.html>