From 37059e505b6ef0ad5046fca752571bced88573de Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 14 Jan 2016 19:32:22 +0000
Subject: [PATCH] remove some unnecessary code

---
 ostd/tuple.hh       | 16 ++++++----------
 ostd/type_traits.hh | 44 --------------------------------------------
 2 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/ostd/tuple.hh b/ostd/tuple.hh
index f14c682..cea2d5c 100644
--- a/ostd/tuple.hh
+++ b/ostd/tuple.hh
@@ -53,10 +53,9 @@ namespace detail {
                 "attempt to default construct a reference element in a tuple");
         }
 
-        template<typename T, typename = EnableIf<And<
-            Not<IntegralConstant<bool, IsSame<Decay<T>, TupleLeaf>>>,
-            IntegralConstant<bool, IsConstructible<H, T>>
-        >::value>>
+        template<typename T, typename = EnableIf<
+            !IsSame<Decay<T>, TupleLeaf> && IsConstructible<H, T>
+        >>
         explicit TupleLeaf(T &&t): p_value(forward<T>(t)) {
             static_assert(!IsReference<H> ||
                           (IsLvalueReference<H> &&
@@ -136,12 +135,9 @@ namespace detail {
         template<typename A>
         TupleLeaf(IntegralConstant<int, 2>, const A &a): H(a) {}
 
-        template<typename T,
-                 typename = EnableIf<And<
-                     Not<IntegralConstant<bool, IsSame<Decay<T>, TupleLeaf>>>,
-                     IntegralConstant<bool, IsConstructible<H, T>>
-                 >::value>
-        > explicit TupleLeaf(T &&t): H(forward<T>(t)) {}
+        template<typename T, typename = EnableIf<
+            !IsSame<Decay<T>, TupleLeaf> && IsConstructible<H, T>
+        >> explicit TupleLeaf(T &&t): H(forward<T>(t)) {}
 
         template<typename T, typename A>
         explicit TupleLeaf(IntegralConstant<int, 0>, const A &, T &&t):
diff --git a/ostd/type_traits.hh b/ostd/type_traits.hh
index c14d719..5952e90 100644
--- a/ostd/type_traits.hh
+++ b/ostd/type_traits.hh
@@ -64,50 +64,6 @@ using False = IntegralConstant<bool, false>;
 
 template<typename T, T val> constexpr T IntegralConstant<T, val>::value;
 
-/* and */
-
-namespace detail {
-    template<bool B, typename ...A> struct AndBase;
-
-    template<typename ...A>
-    struct AndBase<false, A...>: False {};
-
-    template<>
-    struct AndBase<true>: True {};
-
-    template<typename T>
-    struct AndBase<true, T>: IntegralConstant<bool, T::Type::value> {};
-
-    template<typename T, typename ...A>
-    struct AndBase<true, T, A...>: AndBase<T::Type::value, A...> {};
-}
-
-template<typename T, typename ...A>
-struct And: detail::AndBase<T::Type::value, A...> {};
-
-/* or */
-
-namespace detail {
-    template<bool B, typename ...A> struct OrBase;
-
-    template<>
-    struct OrBase<false>: False {};
-
-    template<typename T, typename ...A>
-    struct OrBase<false, T, A...>: OrBase<T::Type::value, A...> {};
-
-    template<typename ...A>
-    struct OrBase<true, A...>: True {};
-}
-
-template<typename T, typename ...A>
-struct Or: detail::OrBase<T::Type::value, A...> {};
-
-/* not */
-
-template<typename T>
-struct Not: IntegralConstant<bool, !T::Type::value> {};
-
 /* type equality */
 
 template<typename, typename> constexpr bool IsSame       = false;