From 2c4d6fee09d179185d61eb3f47cb843ff1740a0f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 19 Jan 2016 19:14:02 +0000
Subject: [PATCH] convert TupleSize to template var

---
 ostd/array.hh          |  2 +-
 ostd/format.hh         |  2 +-
 ostd/internal/tuple.hh | 20 ++++++++++----------
 ostd/tuple.hh          |  5 ++---
 ostd/types.hh          |  6 ++++++
 ostd/utility.hh        |  2 +-
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ostd/array.hh b/ostd/array.hh
index e861b1e..c27a4b1 100644
--- a/ostd/array.hh
+++ b/ostd/array.hh
@@ -77,7 +77,7 @@ struct Array {
 };
 
 template<typename T, Size N>
-struct TupleSize<Array<T, N>>: Constant<Size, N> {};
+constexpr Size TupleSize<Array<T, N>> = N;
 
 template<Size I, typename T, Size N>
 struct TupleElementBase<I, Array<T, N>> {
diff --git a/ostd/format.hh b/ostd/format.hh
index e4eda0d..9f9b54d 100644
--- a/ostd/format.hh
+++ b/ostd/format.hh
@@ -504,7 +504,7 @@ namespace detail {
                                 EnableIf<IsTupleLike<T>::value, bool>
                                     = true) {
         if (expandval) {
-            return FmtTupleUnpacker<TupleSize<T>::value>::unpack(writer,
+            return FmtTupleUnpacker<TupleSize<T>>::unpack(writer,
                 fmtn, esc, fmt, item);
         }
         return format_impl(writer, fmtn, esc, fmt, item);
diff --git a/ostd/internal/tuple.hh b/ostd/internal/tuple.hh
index a12789d..4878d26 100644
--- a/ostd/internal/tuple.hh
+++ b/ostd/internal/tuple.hh
@@ -18,11 +18,11 @@ template<typename T, Size I> struct Array;
 
 /* tuple size */
 
-template<typename T> struct TupleSize;
+template<typename T> constexpr Size TupleSize = detail::Undefined<T>();
 
-template<typename T> struct TupleSize<const T>: public TupleSize<T> {};
-template<typename T> struct TupleSize<volatile T>: public TupleSize<T> {};
-template<typename T> struct TupleSize<const volatile T>: public TupleSize<T> {};
+template<typename T> constexpr Size TupleSize<const T> = TupleSize<T>;
+template<typename T> constexpr Size TupleSize<volatile T> = TupleSize<T>;
+template<typename T> constexpr Size TupleSize<const volatile T> = TupleSize<T>;
 
 /* tuple element */
 
@@ -142,8 +142,8 @@ public:
         detail::TupleTypes<T...>>::Type;
 };
 
-template<typename ...T> struct TupleSize<detail::TupleTypes<T...>>:
-    Constant<Size, sizeof...(T)> {};
+template<typename ...T> constexpr Size TupleSize<detail::TupleTypes<T...>>
+    = sizeof...(T);
 
 template<typename ...T> struct IsTupleLike<detail::TupleTypes<T...>>: True {};
 
@@ -173,7 +173,7 @@ namespace detail {
         using Type = typename MakeTupleTypesBase<TupleTypes<>, T, S, E>::Type;
     };
 
-    template<typename T, Size E = TupleSize<RemoveReference<T>>::value, Size S = 0>
+    template<typename T, Size E = TupleSize<RemoveReference<T>>, Size S = 0>
     using MakeTupleTypes = typename MakeTupleTypesImpl<T, E, S>::Type;
 }
 
@@ -204,7 +204,7 @@ namespace detail {
 
     template<typename T, typename U>
     constexpr bool TupleConvertible<T, U, true, true> = TupleConvertibleApply<
-        TupleSize<RemoveReference<T>>::value == TupleSize<U>::value, T, U
+        TupleSize<RemoveReference<T>> == TupleSize<U>, T, U
     >;
 }
 
@@ -235,7 +235,7 @@ namespace detail {
 
     template<typename T, typename U>
     constexpr bool TupleConstructible<T, U, true, true> = TupleConstructibleApply<
-        TupleSize<RemoveReference<T>>::value == TupleSize<U>::value, T, U
+        TupleSize<RemoveReference<T>> == TupleSize<U>, T, U
     >;
 }
 
@@ -266,7 +266,7 @@ namespace detail {
 
     template<typename T, typename U>
     constexpr bool TupleAssignable<T, U, true, true> = TupleAssignableApply<
-        TupleSize<RemoveReference<T>>::value == TupleSize<U>::value, T, U
+        TupleSize<RemoveReference<T>> == TupleSize<U>, T, U
     >;
 }
 
diff --git a/ostd/tuple.hh b/ostd/tuple.hh
index ac6375d..704f0fc 100644
--- a/ostd/tuple.hh
+++ b/ostd/tuple.hh
@@ -17,8 +17,7 @@ namespace ostd {
 
 /* tuple size */
 
-template<typename ...T> struct TupleSize<Tuple<T...>>:
-    Constant<Size, sizeof...(T)> {};
+template<typename ...T> constexpr Size TupleSize<Tuple<T...>> = sizeof...(T);
 
 /* tuple element */
 
@@ -507,7 +506,7 @@ namespace detail {
     struct TupleLess {
         template<typename T, typename U>
         bool operator()(const T &x, const U &y) {
-            constexpr Size J = TupleSize<T>::value - I;
+            constexpr Size J = TupleSize<T> - I;
             if (get<J>(x) < get<J>(y)) return true;
             if (get<J>(y) < get<J>(x)) return false;
             return TupleLess<I - 1>()(x, y);
diff --git a/ostd/types.hh b/ostd/types.hh
index 8ba0373..3a39e9d 100644
--- a/ostd/types.hh
+++ b/ostd/types.hh
@@ -84,6 +84,12 @@ using UintFast16 = uint_fast16_t;
 using UintFast32 = uint_fast32_t;
 using UintFast64 = uint_fast64_t;
 
+/* used occasionally for template variables */
+
+namespace detail {
+    template<typename> struct Undefined;
+}
+
 }
 
 #endif
\ No newline at end of file
diff --git a/ostd/utility.hh b/ostd/utility.hh
index 3de716c..453c26d 100644
--- a/ostd/utility.hh
+++ b/ostd/utility.hh
@@ -209,7 +209,7 @@ inline constexpr bool operator>=(const Pair<T, U> &x, const Pair<T, U> &y) {
 }
 
 template<typename T, typename U>
-struct TupleSize<Pair<T, U>>: Constant<Size, 2> {};
+constexpr Size TupleSize<Pair<T, U>> = 2;
 
 template<typename T, typename U>
 struct TupleElementBase<0, Pair<T, U>> {