From: Stephen Seo <seo.disparate@gmail.com>
Date: Mon, 14 Mar 2016 08:53:57 +0000 (+0900)
Subject: Made some Meta stuff more generic
X-Git-Tag: 1.0~109
X-Git-Url: https://git.seodisparate.com/stephenseo/server_config?a=commitdiff_plain;h=c3f90ec6b096cad85187f942f2289e1420ea1354;p=EntityComponentMetaSystem

Made some Meta stuff more generic
---

diff --git a/src/EC/Meta/Combine.hpp b/src/EC/Meta/Combine.hpp
index 59e0e9a..b6e4b9b 100644
--- a/src/EC/Meta/Combine.hpp
+++ b/src/EC/Meta/Combine.hpp
@@ -14,8 +14,8 @@ namespace EC
             using type = TypeList<>;
         };
 
-        template <typename... TypesA, typename... TypesB>
-        struct CombineHelper<TypeList<TypesA...>, TypeList<TypesB...> >
+        template <template <typename...> class TTypeListA, template <typename...> class TTypeListB, typename... TypesA, typename... TypesB>
+        struct CombineHelper<TTypeListA<TypesA...>, TTypeListB<TypesB...> >
         {
             using type = TypeList<TypesA..., TypesB...>;
         };
diff --git a/src/EC/Meta/Contains.hpp b/src/EC/Meta/Contains.hpp
index 32f05be..b9e043e 100644
--- a/src/EC/Meta/Contains.hpp
+++ b/src/EC/Meta/Contains.hpp
@@ -15,12 +15,12 @@ namespace EC
         {
         };
 
-        template <typename T, typename Type, typename... Types>
-        struct ContainsHelper<T, TypeList<Type, Types...> > :
+        template <typename T, template <typename...> class TTypeList, typename Type, typename... Types>
+        struct ContainsHelper<T, TTypeList<Type, Types...> > :
             std::conditional<
                 std::is_same<T, Type>::value,
                 std::true_type,
-                ContainsHelper<T, TypeList<Types...> >
+                ContainsHelper<T, TTypeList<Types...> >
             >::type
         {
         };
diff --git a/src/EC/Meta/ContainsAll.hpp b/src/EC/Meta/ContainsAll.hpp
index cb3440c..c54bbc4 100644
--- a/src/EC/Meta/ContainsAll.hpp
+++ b/src/EC/Meta/ContainsAll.hpp
@@ -15,8 +15,8 @@ namespace EC
         {
         };
 
-        template <typename Type, typename... Types, typename TTypeListB>
-        struct ContainsAllHelper<TypeList<Type, Types...>, TTypeListB> :
+        template <template <typename...> class TTypeListA, typename Type, typename... Types, typename TTypeListB>
+        struct ContainsAllHelper<TTypeListA<Type, Types...>, TTypeListB> :
             std::conditional<
                 Contains<Type, TTypeListB>::value,
                 ContainsAllHelper<TypeList<Types...>, TTypeListB>,
diff --git a/src/EC/Meta/IndexOf.hpp b/src/EC/Meta/IndexOf.hpp
index 8adf44f..7978f57 100644
--- a/src/EC/Meta/IndexOf.hpp
+++ b/src/EC/Meta/IndexOf.hpp
@@ -13,16 +13,16 @@ namespace EC
         {
         };
 
-        template <typename T, typename... Types>
-        struct IndexOf<T, TypeList<T, Types...> > :
+        template <typename T, template <typename...> class TTypeList, typename... Types>
+        struct IndexOf<T, TTypeList<T, Types...> > :
             std::integral_constant<std::size_t, 0>
         {
         };
 
-        template <typename T, typename Type, typename... Types>
-        struct IndexOf<T, TypeList<Type, Types...> > :
+        template <typename T, template <typename...> class TTypeList, typename Type, typename... Types>
+        struct IndexOf<T, TTypeList<Type, Types...> > :
             std::integral_constant<std::size_t, 1 +
-                IndexOf<T, TypeList<Types...> >::value
+                IndexOf<T, TTypeList<Types...> >::value
             >
         {
         };