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

some fixes, compiles again

Browse source
This commit is contained in:
Christian Zimmermann 2018-01-07 16:57:01 +01:00
parent 728f36f538
commit 85f221f5e1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/multi_array_operation.h
View file

@ -382,8 +382,8 @@ namespace MultiArrayTools
template <typename T, class OpClass, class... Ranges> template <typename T, class OpClass, class... Ranges>
void OperationMaster<T,OpClass,Ranges...>::performAssignment(std::intptr_t blockIndexNum) void OperationMaster<T,OpClass,Ranges...>::performAssignment(std::intptr_t blockIndexNum)
{ {
static auto loop = mkLoop(mIndex, *this, mSecond); //static auto loop = mkLoop(mIndex, *this, mSecond);
loop(); //loop();
for(*mIndex = 0; mIndex->pos() != mIndex->max(); mIndex->pp(blockIndexNum) ){ for(*mIndex = 0; mIndex->pos() != mIndex->max(); mIndex->pp(blockIndexNum) ){
block(); block();

2
src/ranges/index_base.h
View file

@ -76,7 +76,7 @@ namespace MultiArrayTools
// CHECK / IMPLEMENT !!!!!! // CHECK / IMPLEMENT !!!!!!
template <class Expr, typename... Args> template <class Expr, typename... Args>
auto ifor(const Args&... args) const -> decltype(THIS().template ifor<Expr>(args...)) auto ifor(const Args&... args) const -> decltype(THIS().template ifor<Expr>(args...))
{ return THIS().template ifor<Expr>(args...) } { return THIS().template ifor<Expr>(args...); }
private: private:

2
src/xfor/xfor.h
View file

@ -26,7 +26,7 @@ namespace MultiArrayHelper
std::shared_ptr<IndexClass> mIndPtr; std::shared_ptr<IndexClass> mIndPtr;
Expr mExpr; Expr mExpr;
} };
} // namespace MultiArrayHelper } // namespace MultiArrayHelper