TypMap::num -> num()
This commit is contained in:
parent
a8e24efff2
commit
2049cb25ed
8 changed files with 10 additions and 10 deletions
|
@ -631,7 +631,7 @@ namespace MultiArrayTools
|
||||||
template <typename U, SpaceType TYPE, size_t S>
|
template <typename U, SpaceType TYPE, size_t S>
|
||||||
vector<size_t> GenSingleRange<U,TYPE,S>::typeNum() const
|
vector<size_t> GenSingleRange<U,TYPE,S>::typeNum() const
|
||||||
{
|
{
|
||||||
return {NumTypeMap<U>::num};
|
return {NumTypeMap<U>::num()};
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename U, SpaceType TYPE, size_t S>
|
template <typename U, SpaceType TYPE, size_t S>
|
||||||
|
@ -674,7 +674,7 @@ namespace MultiArrayTools
|
||||||
DataHeader h;
|
DataHeader h;
|
||||||
h.spaceType = static_cast<int>( TYPE );
|
h.spaceType = static_cast<int>( TYPE );
|
||||||
h.metaSize = metaSize(mSpace);
|
h.metaSize = metaSize(mSpace);
|
||||||
h.metaType = NumTypeMap<U>::num;
|
h.metaType = NumTypeMap<U>::num();
|
||||||
h.multiple = 0;
|
h.multiple = 0;
|
||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
|
|
|
@ -401,7 +401,7 @@ namespace MultiArrayTools
|
||||||
DataHeader h;
|
DataHeader h;
|
||||||
h.spaceType = static_cast<int>( SpaceType::ANY );
|
h.spaceType = static_cast<int>( SpaceType::ANY );
|
||||||
h.metaSize = metaSize(mSubSet);
|
h.metaSize = metaSize(mSubSet);
|
||||||
h.metaType = NumTypeMap<MetaType>::num;
|
h.metaType = NumTypeMap<MetaType>::num();
|
||||||
h.multiple = 0;
|
h.multiple = 0;
|
||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
|
|
|
@ -150,7 +150,7 @@ namespace MultiArrayTools
|
||||||
#define XCOMMAX() ,
|
#define XCOMMAX() ,
|
||||||
|
|
||||||
#define include_type(t,n) template <> struct TypeMap<n> { typedef t type; static constexpr size_t size = sizeof(t); }; \
|
#define include_type(t,n) template <> struct TypeMap<n> { typedef t type; static constexpr size_t size = sizeof(t); }; \
|
||||||
template <> struct NumTypeMap<t> { static constexpr size_t num = n; };
|
template <> struct NumTypeMap<t> { inline static size_t num(){ return n; } };
|
||||||
|
|
||||||
#include "ranges/type_register.h"
|
#include "ranges/type_register.h"
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -355,7 +355,7 @@ namespace MultiArrayTools
|
||||||
template <typename U>
|
template <typename U>
|
||||||
vector<size_t> ValueRange<U>::typeNum() const
|
vector<size_t> ValueRange<U>::typeNum() const
|
||||||
{
|
{
|
||||||
return {NumTypeMap<U>::num};
|
return {NumTypeMap<U>::num()};
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename U>
|
template <typename U>
|
||||||
|
@ -404,7 +404,7 @@ namespace MultiArrayTools
|
||||||
DataHeader h;
|
DataHeader h;
|
||||||
h.spaceType = static_cast<int>( SpaceType::NONE );
|
h.spaceType = static_cast<int>( SpaceType::NONE );
|
||||||
h.metaSize = 0;
|
h.metaSize = 0;
|
||||||
h.metaType = NumTypeMap<U>::num;
|
h.metaType = NumTypeMap<U>::num();
|
||||||
h.multiple = 0;
|
h.multiple = 0;
|
||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ namespace MultiArrayTools
|
||||||
|
|
||||||
vector<size_t> GenSingleRange<size_t,SpaceType::NONE,MUI>::typeNum() const
|
vector<size_t> GenSingleRange<size_t,SpaceType::NONE,MUI>::typeNum() const
|
||||||
{
|
{
|
||||||
return {NumTypeMap<size_t>::num};
|
return {NumTypeMap<size_t>::num()};
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GenSingleRange<size_t,SpaceType::NONE,MUI>::cmeta(char* target, size_t pos) const
|
size_t GenSingleRange<size_t,SpaceType::NONE,MUI>::cmeta(char* target, size_t pos) const
|
||||||
|
|
|
@ -78,7 +78,7 @@ namespace MultiArrayTools
|
||||||
|
|
||||||
vector<size_t> GenSingleRange<size_t,SpaceType::NUL,0>::typeNum() const
|
vector<size_t> GenSingleRange<size_t,SpaceType::NUL,0>::typeNum() const
|
||||||
{
|
{
|
||||||
return {NumTypeMap<size_t>::num};
|
return {NumTypeMap<size_t>::num()};
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GenSingleRange<size_t,SpaceType::NUL,0>::cmeta(char* target, size_t pos) const
|
size_t GenSingleRange<size_t,SpaceType::NUL,0>::cmeta(char* target, size_t pos) const
|
||||||
|
|
|
@ -61,7 +61,7 @@ namespace MultiArrayTools
|
||||||
|
|
||||||
vector<size_t> GenSingleRange<int,SpaceType::PSPACE,MUI>::typeNum() const
|
vector<size_t> GenSingleRange<int,SpaceType::PSPACE,MUI>::typeNum() const
|
||||||
{
|
{
|
||||||
return {NumTypeMap<int>::num};
|
return {NumTypeMap<int>::num()};
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GenSingleRange<int,SpaceType::PSPACE,MUI>::cmeta(char* target, size_t pos) const
|
size_t GenSingleRange<int,SpaceType::PSPACE,MUI>::cmeta(char* target, size_t pos) const
|
||||||
|
|
|
@ -58,7 +58,7 @@ namespace MultiArrayTools
|
||||||
|
|
||||||
vector<size_t> GenSingleRange<size_t,SpaceType::SPIN,4>::typeNum() const
|
vector<size_t> GenSingleRange<size_t,SpaceType::SPIN,4>::typeNum() const
|
||||||
{
|
{
|
||||||
return {NumTypeMap<size_t>::num};
|
return {NumTypeMap<size_t>::num()};
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GenSingleRange<size_t,SpaceType::SPIN,4>::cmeta(char* target, size_t pos) const
|
size_t GenSingleRange<size_t,SpaceType::SPIN,4>::cmeta(char* target, size_t pos) const
|
||||||
|
|
Loading…
Reference in a new issue