diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-06 16:39:29 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-06 16:39:29 +0000 |
| commit | a304f2edf185cc84bf2b77515ab3ad104745ba0e (patch) | |
| tree | 21de012aea137592c7ebbb299c1a999510396fad /libstdc++-v3 | |
| parent | eafa229b781aa62804b6970f9b5403546bf31bb2 (diff) | |
| download | gcc-a304f2edf185cc84bf2b77515ab3ad104745ba0e.tar.gz | |
2011-06-06 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/move.h (move_if_noexcept): Use __and_ and __not_.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174708 138bc75d-0d04-0410-961f-82ee72b054a4
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 2f485b1423d..ff7e2dad426 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 ca7686eb162..6f3b420640d 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); } |