From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 6 Jun 2011 16:39:29 +0000 (+0000)
Subject: move.h (move_if_noexcept): Use __and_ and __not_.
X-Git-Tag: releases/gcc-4.7.0~6203
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7aca3d94becc5827df345447c94b128fd0c45cf8;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2f485b1423d8..ff7e2dad4260 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 ca7686eb1623..6f3b420640d7 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); }