diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-06-06 16:39:29 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-06-06 16:39:29 +0000 |
| commit | 7aca3d94becc5827df345447c94b128fd0c45cf8 (patch) | |
| tree | 21de012aea137592c7ebbb299c1a999510396fad /libstdc++-v3 | |
| parent | 11b815cab8300efb59005e2bbc27b79cca11b669 (diff) | |
| download | gcc-7aca3d94becc5827df345447c94b128fd0c45cf8.zip gcc-7aca3d94becc5827df345447c94b128fd0c45cf8.tar.gz gcc-7aca3d94becc5827df345447c94b128fd0c45cf8.tar.bz2 | |
move.h (move_if_noexcept): Use __and_ and __not_.
2011-06-06 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/move.h (move_if_noexcept): Use __and_ and __not_.
From-SVN: r174708
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/move.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2f485b1..ff7e2da 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2011-06-06 Paolo Carlini <paolo.carlini@oracle.com> + + * include/bits/move.h (move_if_noexcept): Use __and_ and __not_. + 2011-06-05 Jonathan Wakely <jwakely.gcc@gmail.com> * include/bits/ptr_traits.h (pointer_traits): Fix typos. diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h index ca7686e..6f3b420 100644 --- a/libstdc++-v3/include/bits/move.h +++ b/libstdc++-v3/include/bits/move.h @@ -90,8 +90,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ template<typename _Tp> inline typename - conditional<(!is_nothrow_move_constructible<_Tp>::value - && is_copy_constructible<_Tp>::value), + conditional<__and_<__not_<is_nothrow_move_constructible<_Tp>>, + is_copy_constructible<_Tp>>::value, const _Tp&, _Tp&&>::type move_if_noexcept(_Tp& __x) noexcept { return std::move(__x); } |