From 143ec783558c63c656bbb6991dc07e6f333addc4 Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Mon, 17 Sep 2018 16:34:47 +0200 Subject: [PATCH] forgot to use new 'value' functions -> use it now; still works --- src/include/map_range.h | 4 ++-- src/include/xfor/xfor.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/include/map_range.h b/src/include/map_range.h index abf8075..f4740a9 100644 --- a/src/include/map_range.h +++ b/src/include/map_range.h @@ -321,7 +321,7 @@ namespace MultiArrayTools constexpr size_t NEXT = Op::SIZE; const ExtType npos = last; const size_t pos = mIndPtr->posAt( mOp.get( npos ) ); - const size_t mnpos = PosForward::value(mlast, mMax, pos); + const size_t mnpos = PosForward::valuex(mlast, mStep, pos); mExpr(mnpos, Getter::template getX( npos ) ); } @@ -332,7 +332,7 @@ namespace MultiArrayTools constexpr size_t NEXT = Op::SIZE; const ExtType npos = last; const size_t pos = mIndPtr->posAt( mOp.get( npos ) ); - const size_t mnpos = PosForward::value(mlast, mMax, pos); + const size_t mnpos = PosForward::valuex(mlast, mStep, pos); mExpr(mnpos, Getter::template getX( npos )); } diff --git a/src/include/xfor/xfor.h b/src/include/xfor/xfor.h index e6dab2c..5c3379e 100644 --- a/src/include/xfor/xfor.h +++ b/src/include/xfor/xfor.h @@ -190,7 +190,8 @@ namespace MultiArrayHelper typedef typename IndexClass::RangeType RangeType; for(size_t pos = 0u; pos != ForBound::template bound(mMax); ++pos){ //for(size_t pos = mSPos; pos != mMax; ++pos){ - const size_t mnpos = PosForward::value(mlast, mMax, pos); + //const size_t mnpos = PosForward::value(mlast, mMax, pos); + const size_t mnpos = PosForward::valuex(mlast, mStep, pos); const ExtType npos = last + mExt*pos; mExpr(mnpos, npos); } @@ -203,7 +204,8 @@ namespace MultiArrayHelper const ExtType last; for(size_t pos = 0u; pos != ForBound::template bound(mMax); ++pos){ //for(size_t pos = mSPos; pos != mMax; ++pos){ - const size_t mnpos = PosForward::value(mlast, mMax, pos); + //const size_t mnpos = PosForward::value(mlast, mMax, pos); + const size_t mnpos = PosForward::valuex(mlast, mStep, pos); const ExtType npos = last + mExt*pos; mExpr(mnpos, npos); }