fix compile errors from previous commit
This commit is contained in:
parent
4391d3a79a
commit
9ab27d1e5a
2 changed files with 11 additions and 4 deletions
|
@ -142,6 +142,13 @@ namespace MultiArrayTools
|
||||||
AssignmentExpr2<T,Target,OpClass>::AssignmentExpr2(T* dataPtr, const Target& tar, const OpClass& sec) :
|
AssignmentExpr2<T,Target,OpClass>::AssignmentExpr2(T* dataPtr, const Target& tar, const OpClass& sec) :
|
||||||
mTar(tar), mSec(sec), mDataPtr(dataPtr) {}
|
mTar(tar), mSec(sec), mDataPtr(dataPtr) {}
|
||||||
|
|
||||||
|
template <typename T, class Target, class OpClass>
|
||||||
|
inline void AssignmentExpr2<T,Target,OpClass>::operator()(size_t start)
|
||||||
|
{
|
||||||
|
ExtType last;
|
||||||
|
mDataPtr[last.val()] = mSec.get(last.next());
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T, class Target, class OpClass>
|
template <typename T, class Target, class OpClass>
|
||||||
inline void AssignmentExpr2<T,Target,OpClass>::operator()(size_t start, ExtType last)
|
inline void AssignmentExpr2<T,Target,OpClass>::operator()(size_t start, ExtType last)
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,7 +32,7 @@ namespace MultiArrayHelper
|
||||||
ExtBase& operator=(const ExtBase& in) = default;
|
ExtBase& operator=(const ExtBase& in) = default;
|
||||||
ExtBase& operator=(ExtBase&& in) = default;
|
ExtBase& operator=(ExtBase&& in) = default;
|
||||||
|
|
||||||
//virtual size_t size() const = 0;
|
virtual size_t size() const = 0;
|
||||||
//virtual size_t rootSteps() const = 0;
|
//virtual size_t rootSteps() const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ namespace MultiArrayHelper
|
||||||
|
|
||||||
ExtT(const ExtType& in) : mExt(in) {}
|
ExtT(const ExtType& in) : mExt(in) {}
|
||||||
|
|
||||||
//virtual size_t size() const override final;
|
virtual size_t size() const override final { return sizeof(ExtType)/sizeof(size_t); }
|
||||||
//virtual size_t rootSteps() const override final;
|
//virtual size_t rootSteps() const override final;
|
||||||
const ExtType& ext() const { return mExt; }
|
const ExtType& ext() const { return mExt; }
|
||||||
};
|
};
|
||||||
|
@ -835,7 +835,7 @@ namespace MultiArrayHelper
|
||||||
auto ExpressionHolder<Expr>::rootSteps(std::intptr_t iPtrNum) const
|
auto ExpressionHolder<Expr>::rootSteps(std::intptr_t iPtrNum) const
|
||||||
-> ExtType
|
-> ExtType
|
||||||
{
|
{
|
||||||
return std::dynamic_pointer_cast<ExtT<ExtType>>(*mExpr.dRootSteps(iPtrNum))->ext();
|
return std::dynamic_pointer_cast<ExtT<ExtType>>(mExpr.dRootSteps(iPtrNum))->ext();
|
||||||
//return *reinterpret_cast<ExtType const*>( mExpr.dRootSteps(iPtrNum).first );
|
//return *reinterpret_cast<ExtType const*>( mExpr.dRootSteps(iPtrNum).first );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -843,7 +843,7 @@ namespace MultiArrayHelper
|
||||||
auto ExpressionHolder<Expr>::extension() const
|
auto ExpressionHolder<Expr>::extension() const
|
||||||
-> ExtType
|
-> ExtType
|
||||||
{
|
{
|
||||||
return std::dynamic_pointer_cast<ExtT<ExtType>>(*mExpr.dExtension())->ext();
|
return std::dynamic_pointer_cast<ExtT<ExtType>>(mExpr.dExtension())->ext();
|
||||||
//return *reinterpret_cast<ExtType const*>( mExpr.dExtension().first );
|
//return *reinterpret_cast<ExtType const*>( mExpr.dExtension().first );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue