chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changes required for gcc 10

Browse source
This commit is contained in:
Christian Zimmermann 2020-05-14 18:13:01 +02:00
parent ba350c516d
commit c8d9eb9aa4
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/include/xfor/iloop.h
View file

@ -19,14 +19,14 @@ namespace MultiArrayHelper
typedef typename std::tuple_element<N,LTp>::type LType; typedef typename std::tuple_element<N,LTp>::type LType;
return LType::SIZE + NN<N-1>::template LSIZE<LTp>(); return LType::SIZE + NN<N-1>::template LSIZE<LTp>();
} }
/*
template <class LTp> template <class LTp>
static inline constexpr size_t lsize(const LTp& ltp) static inline constexpr size_t lsize(const LTp& ltp)
{ {
typedef typename std::tuple_element<N,LTp>::type LType; typedef typename std::tuple_element<N,LTp>::type LType;
return LType::SIZE + NN<N-1>::lsize(ltp); return LType::SIZE + NN<N-1>::lsize(ltp);
} }
*/
template <class LTp> template <class LTp>
static inline auto rootSteps(const LTp& ltp, std::intptr_t i = 0) static inline auto rootSteps(const LTp& ltp, std::intptr_t i = 0)
{ {
@ -48,7 +48,8 @@ namespace MultiArrayHelper
size_t mpos, ExtType pos) size_t mpos, ExtType pos)
{ {
NN<N-1>::exec(ltp,umpos,mpos,pos); NN<N-1>::exec(ltp,umpos,mpos,pos);
std::get<N>(ltp)(std::get<N>(umpos)*mpos, pos.template nn<NN<N-1>::lsize(ltp)>()); //std::get<N>(ltp)(std::get<N>(umpos)*mpos, pos.template nn<NN<N-1>::lsize(ltp)>());
std::get<N>(ltp)(std::get<N>(umpos)*mpos, pos.template nn<NN<N-1>::template LSIZE<LTp>()>());
return 0; return 0;
} }