portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-25 05:05:56 +01:00
Code Releases Activity

Hmmm lots of warnings depending on compiler ...

Browse Source
This commit is contained in:
Michael Marshall 2019-02-14 19:17:12 +00:00
parent b9bee45277
commit 8cb96cb693
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Grid/serialisation/BaseIO.h
View File

@ -120,11 +120,16 @@ namespace Grid {
static constexpr std::size_t Dimension(unsigned int dim) {
return ( dim == 0 ) ? N : Traits<T>::Dimension(dim - 1); }
static constexpr std::size_t DimensionNT(unsigned int dim) {
std::size_t DimSize = N;
bool bGotDimSize = false;
if( N != 1 ) {
if( dim == 0 ) return N;
if( dim == 0 )
bGotDimSize = true;
dim--;
}
return Traits<T>::DimensionNT(dim);
if( !bGotDimSize )
DimSize = Traits<T>::DimensionNT(dim);
return DimSize;
}
};
template <typename T, int N> struct Traits<iMatrix<T, N>> {
@ -138,11 +143,16 @@ namespace Grid {
static constexpr std::size_t Dimension(unsigned int dim) {
return ( dim == 0 || dim == 1 ) ? N : Traits<T>::Dimension(dim - 2); }
static constexpr std::size_t DimensionNT(unsigned int dim) {
std::size_t DimSize = N;
bool bGotDimSize = false;
if( N != 1 ) {
if( dim == 0 || dim == 1 ) return N;
if( dim == 0 || dim == 1 )
bGotDimSize = true;
dim -= 2;
}
return Traits<T>::DimensionNT(dim);
if( !bGotDimSize )
DimSize = Traits<T>::DimensionNT(dim);
return DimSize;
}
};
template <typename T, int N> struct Traits<std::array<T, N>> : Traits<iVector<T, N>> {};