@@ -63,7 +63,7 @@ template<typename TL>
6363struct max_element_size
6464{
6565 static constexpr size_t value = ::etl::max<size_t >(
66- element_size<typename TL::type >::value, max_element_size<typename TL::tail>::value);
66+ element_size<typename TL::head >::value, max_element_size<typename TL::tail>::value);
6767};
6868
6969template <>
@@ -115,7 +115,7 @@ using VariantQueue
115115template <typename TypeList, size_t ID = 0 >
116116struct variant_T_do
117117{
118- using T = typename TypeList::type ;
118+ using T = typename TypeList::head ;
119119 using recurse = variant_T_do<typename TypeList::tail, ID + 1 >;
120120
121121 template <typename Visitor, typename R>
@@ -150,7 +150,7 @@ struct variant_q
150150 template <typename TL, size_t ID = 0 >
151151 struct variant_do
152152 {
153- using T = typename TL::type ;
153+ using T = typename TL::head ;
154154 using recurse = variant_do<typename TL::tail, ID + 1 >;
155155
156156 template <typename Visitor, typename R>
@@ -182,7 +182,7 @@ struct variant_q
182182 ::etl::type_list_contains<TypeList, T>::value,
183183 " type must be a part of the variant type list" );
184184
185- buffer[0 ] = static_cast <uint8_t >(::etl::type_list_index_of <TypeList, T>::value);
185+ buffer[0 ] = static_cast <uint8_t >(::etl::type_list_index_of_type <TypeList, T>::value);
186186 buffer.advance (1 );
187187 buffer.reinterpret_as <T>()[0 ] = t;
188188 buffer.advance (sizeof (T));
@@ -272,7 +272,7 @@ struct variant_q
272272 {
273273 return nullptr ;
274274 }
275- buffer[0 ] = static_cast <uint8_t >(::etl::type_list_index_of <TypeList, T>::value);
275+ buffer[0 ] = static_cast <uint8_t >(::etl::type_list_index_of_type <TypeList, T>::value);
276276 return reinterpret_cast <T*>(&buffer[1 ]);
277277 }
278278};
0 commit comments