maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix a typo in the noexcept calculation for __compressed_pair::swap. Thanks to EricWF for the bug report and the fix. 

llvm-svn: 212046
This commit is contained in:
Marshall Clow 2014-06-30 15:35:09 +00:00
parent 304fe3ff71
commit afa72ed47c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcxx/include/memory
View File

@ -2019,7 +2019,7 @@ public:
_LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x) _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x)
_NOEXCEPT_(__is_nothrow_swappable<_T1>::value && _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
__is_nothrow_swappable<_T1>::value) __is_nothrow_swappable<_T2>::value)
{ {
using _VSTD::swap; using _VSTD::swap;
swap(__first_, __x.__first_); swap(__first_, __x.__first_);
@ -2110,7 +2110,7 @@ public:
_LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x) _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x)
_NOEXCEPT_(__is_nothrow_swappable<_T1>::value && _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
__is_nothrow_swappable<_T1>::value) __is_nothrow_swappable<_T2>::value)
{ {
using _VSTD::swap; using _VSTD::swap;
swap(__second_, __x.__second_); swap(__second_, __x.__second_);
@ -2203,7 +2203,7 @@ public:
_LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x) _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x)
_NOEXCEPT_(__is_nothrow_swappable<_T1>::value && _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
__is_nothrow_swappable<_T1>::value) __is_nothrow_swappable<_T2>::value)
{ {
using _VSTD::swap; using _VSTD::swap;
swap(__first_, __x.__first_); swap(__first_, __x.__first_);
@ -2292,7 +2292,7 @@ public:
_LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp&) _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp&)
_NOEXCEPT_(__is_nothrow_swappable<_T1>::value && _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) _LIBCPP_INLINE_VISIBILITY void swap(__compressed_pair& __x)
_NOEXCEPT_(__is_nothrow_swappable<_T1>::value && _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
__is_nothrow_swappable<_T1>::value) __is_nothrow_swappable<_T2>::value)
{base::swap(__x);} {base::swap(__x);}
}; };
@ -2384,7 +2384,7 @@ inline _LIBCPP_INLINE_VISIBILITY
void void
swap(__compressed_pair<_T1, _T2>& __x, __compressed_pair<_T1, _T2>& __y) swap(__compressed_pair<_T1, _T2>& __x, __compressed_pair<_T1, _T2>& __y)
_NOEXCEPT_(__is_nothrow_swappable<_T1>::value && _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
__is_nothrow_swappable<_T1>::value) __is_nothrow_swappable<_T2>::value)
{__x.swap(__y);} {__x.swap(__y);}
// __same_or_less_cv_qualified // __same_or_less_cv_qualified