coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-04-30 19:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for PR 1367

Browse Source
This commit is contained in:
John Wellbelove 2026-03-28 13:50:27 +00:00
parent 03ca3c817e
commit 3638d89f8b
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/etl/generators/type_lookup_generator.h
View File

@ -96,7 +96,7 @@ namespace etl
struct nulltype {};
// For N type pairs.
template <int Id, typename T1, typename... TRest>
template <size_t Id, typename T1, typename... TRest>
struct type_from_id_helper
{
using type = typename etl::conditional<Id == T1::Id,
@ -105,7 +105,7 @@ namespace etl
};
// Specialisation for 1 type pair.
template <int Id, typename T1>
template <size_t Id, typename T1>
struct type_from_id_helper<Id, T1>
{
using type = typename etl::conditional<Id == T1::Id,
@ -234,7 +234,7 @@ namespace etl
cog.outl("//***************************************************************************")
cog.outl("template <typename T1,")
for n in range(2, int(NTypes)):
cog.outl(" typename T%s = etl::type_id_pair<etl::null_type<0>, -%s>," %(n, n))
cog.outl(" typename T%s = etl::type_id_pair<etl::null_type<0>, -%s>," %(n, n))
cog.outl(" typename T%s = etl::type_id_pair<etl::null_type<0>, -%s> >" %(NTypes, NTypes))
cog.outl("struct type_id_lookup")
cog.outl("{")
@ -246,17 +246,17 @@ namespace etl
cog.outl(" {")
cog.outl(" typedef ")
for n in range(1, int(NTypes) + 1):
cog.outl(" typename etl::conditional<Id == T%s::Id, typename T%s::type," %(n, n))
cog.outl(" typename etl::conditional<Id == T%s::Id, typename T%s::type," %(n, n))
cog.out(" etl::null_type<0> >")
for n in range(1, int(NTypes) + 1):
if n == int(NTypes):
cog.outl("::type type;")
else:
cog.out("::type>")
if n % 4 == 0:
if n != int(NTypes):
cog.outl("")
cog.out(" ")
if n == int(NTypes):
cog.outl("::type type;")
else:
cog.out("::type>")
if n % 4 == 0:
if n != int(NTypes):
cog.outl("")
cog.out(" ")
cog.outl("")
cog.outl(" ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), \"Invalid id\");")
cog.outl(" };")
@ -274,7 +274,7 @@ namespace etl
cog.outl(" {")
cog.outl(" value =")
for n in range(1, int(NTypes) + 1) :
cog.outl(" (unsigned int) etl::is_same<T, typename T%s::type>::value ? (unsigned int)T%s::Id :" % (n, n))
cog.outl(" (unsigned int) etl::is_same<T, typename T%s::type>::value ? (unsigned int)T%s::Id :" % (n, n))
cog.outl(" (unsigned int) UNKNOWN")
cog.outl(" };")
cog.outl("")
@ -301,7 +301,7 @@ namespace etl
cog.outl("//***************************************************************************")
cog.outl("template <typename T1,")
for n in range(2, int(NTypes)):
cog.outl(" typename T%s = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >," %n)
cog.outl(" typename T%s = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >," %n)
cog.outl(" typename T%s = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> > >" %NTypes)
cog.outl("struct type_type_lookup")
cog.outl("{")
@ -313,17 +313,17 @@ namespace etl
cog.outl(" {")
cog.outl(" typedef ")
for n in range(1, int(NTypes) + 1):
cog.outl(" typename etl::conditional<etl::is_same<T, typename T%s::type1>::value, typename T%s::type2," %(n, n))
cog.outl(" typename etl::conditional<etl::is_same<T, typename T%s::type1>::value, typename T%s::type2," %(n, n))
cog.out(" etl::null_type<0> >")
for n in range(1, int(NTypes) + 1):
if n == int(NTypes):
cog.outl("::type type;")
else:
cog.out("::type>")
if n % 8 == 0:
if n != int(NTypes):
cog.outl("")
cog.out(" ")
if n == int(NTypes):
cog.outl("::type type;")
else:
cog.out("::type>")
if n % 8 == 0:
if n != int(NTypes):
cog.outl("")
cog.out(" ")
cog.outl("")
cog.outl(" ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), \"Invalid type\");")
cog.outl(" };")

26
include/etl/type_lookup.h
View File

@ -73,7 +73,7 @@ namespace etl
#if ETL_USING_CPP11 && !defined(ETL_TYPE_SELECT_FORCE_CPP03_IMPLEMENTATION)
//***************************************************************************
// type_id_lookup
// type_id_lookup
//***************************************************************************
template <typename... TTypes>
struct type_id_lookup
@ -84,21 +84,21 @@ namespace etl
struct nulltype {};
// For N type pairs.
template <int Id, typename T1, typename... TRest>
template <size_t Id, typename T1, typename... TRest>
struct type_from_id_helper
{
using type = typename etl::conditional<Id == T1::Id,
typename T1::type,
typename type_from_id_helper<Id, TRest...>::type>::type;
typename T1::type,
typename type_from_id_helper<Id, TRest...>::type>::type;
};
// Specialisation for 1 type pair.
template <int Id, typename T1>
template <size_t Id, typename T1>
struct type_from_id_helper<Id, T1>
{
using type = typename etl::conditional<Id == T1::Id,
typename T1::type,
nulltype>::type;
typename T1::type,
nulltype>::type;
};
public:
@ -159,7 +159,7 @@ namespace etl
{
return get_id_from_type<T>();
}
//************************************
template <typename T>
static unsigned int get_id_from_type()
@ -183,16 +183,16 @@ namespace etl
struct type_from_type_helper
{
using type = typename etl::conditional<etl::is_same<T, typename T1::type1>::value,
typename T1::type2,
typename type_from_type_helper<T, TRest...>::type>::type;
typename T1::type2,
typename type_from_type_helper<T, TRest...>::type>::type;
};
template <typename T, typename T1>
struct type_from_type_helper<T, T1>
{
using type = typename etl::conditional<etl::is_same<T, typename T1::type1>::value,
typename T1::type2,
nulltype>::type;
typename T1::type2,
nulltype>::type;
};
public:
@ -370,4 +370,4 @@ namespace etl
#endif
}
#endif
#endif