2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / std / type_traits

diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 184e28b..a8842ed 100644 (file)
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -59,9 +59,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<typename _Tp, _Tp>
     struct integral_constant;
 
-  template<typename, typename, typename...>
+  template<typename...>
     struct __or_;
 
+  template<typename _B1>
+    struct __or_<_B1>
+    : public _B1
+    { };
+
   template<typename _B1, typename _B2>
     struct __or_<_B1, _B2>
     : public conditional<_B1::value, _B1, _B2>::type
@@ -72,9 +77,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     : public conditional<_B1::value, _B1, __or_<_B2, _B3, _Bn...>>::type
     { };
 
-  template<typename, typename, typename...>
+  template<typename...>
     struct __and_;
 
+  template<typename _B1>
+    struct __and_<_B1>
+    : public _B1
+    { };
+
   template<typename _B1, typename _B2>
     struct __and_<_B1, _B2>
     : public conditional<_B1::value, _B2, _B1>::type