From 8bde2d72504a0e8cf1509bd5404452d441ae2470 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Wed, 14 Jul 2021 22:01:07 +0200
Subject: [PATCH] fix bug from previous commit

---
 src/include/multi_array_operation.cc.h | 18 +++---------------
 src/include/multi_array_operation.h    | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/include/multi_array_operation.cc.h b/src/include/multi_array_operation.cc.h
index 79a3568..d6d44aa 100644
--- a/src/include/multi_array_operation.cc.h
+++ b/src/include/multi_array_operation.cc.h
@@ -187,7 +187,7 @@ namespace MultiArrayTools
     */
     template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA>
     AssignmentExpr<T,IOp,AT,Target,OpClass,OIA>::AssignmentExpr(T* dataPtr, const AccessTemplate<AT>& dataAcc, const Target& tar, const OpClass& sec) :
-        mTar(tar), mSec(sec), mDataAcc(dataAcc), mDataPtr(dataPtr) {}
+        mTar(tar), mSec(sec), mDataAcc(static_cast<const AT&>(dataAcc)), mDataPtr(dataPtr) {}
 
     template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA>
     inline void AssignmentExpr<T,IOp,AT,Target,OpClass,OIA>::operator()(size_t start)
@@ -195,25 +195,13 @@ namespace MultiArrayTools
         ExtType last = rootSteps();
 	last.zero();
 	// TODO: ask MA container for data (ptr)!!!
-	//mDataAcc.template exec<typename IOp::Func>(opIndexResolve<OIA>(start,last),mSec,last.next());
-	assert(mDataAcc.get(0) != nullptr);
-	assert(mDataAcc.oget(0) != nullptr);
-	assert(mDataPtr == mDataAcc.oget(0));
-	IOp::f(mDataAcc.oget(0),opIndexResolve<OIA>(start,last),mSec,last.next());
-	//IOp::f(mDataPtr,opIndexResolve<OIA>(start,last),mSec,last.next());
+	mDataAcc.template exec<typename IOp::Func>(opIndexResolve<OIA>(start,last),mSec,last.next());
     }
 
     template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA>
     inline void AssignmentExpr<T,IOp,AT,Target,OpClass,OIA>::operator()(size_t start, ExtType last)
     {
-	//PointerAccess<T> pa(mDataPtr, mDataPtr);
-	//pa.template exec<IOp::Func>(opIndexResolve<OIA>(start,last),mSec,last.next());
-	//mDataAcc.template exec<typename IOp::Func>(opIndexResolve<OIA>(start,last),mSec,last.next());
-	assert(mDataAcc.get(0) != nullptr);
-	assert(mDataAcc.oget(0) != nullptr);
-	assert(mDataPtr == mDataAcc.oget(0));
-	IOp::f(mDataAcc.oget(0),opIndexResolve<OIA>(start,last),mSec,last.next());
-	//IOp::f(mDataPtr,opIndexResolve<OIA>(start,last),mSec,last.next());
+	mDataAcc.template exec<typename IOp::Func>(opIndexResolve<OIA>(start,last),mSec,last.next());
     }
     
     template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA>
diff --git a/src/include/multi_array_operation.h b/src/include/multi_array_operation.h
index 70115b5..ad5bc45 100644
--- a/src/include/multi_array_operation.h
+++ b/src/include/multi_array_operation.h
@@ -219,7 +219,12 @@ namespace MultiArrayTools
     {
     public:
         typedef AccessClass AC;
-        
+
+	AccessTemplate(const AccessTemplate& in) = default;
+	AccessTemplate(AccessTemplate&& in) = default;
+	AccessTemplate& operator=(const AccessTemplate& in) = default;
+	AccessTemplate& operator=(AccessTemplate&& in) = default;
+
         AccessClass& THIS() { return static_cast<AccessClass&>(*this); }
         const AccessClass& THIS() const { return static_cast<const AccessClass&>(*this); }
 
@@ -240,6 +245,8 @@ namespace MultiArrayTools
     public:
 	typedef T value_type;
 	typedef T in_type;
+
+	friend class AccessTemplate<PointerAccess<T>>;
     private:
 	PointerAccess() = default;
 	
@@ -247,12 +254,13 @@ namespace MultiArrayTools
         T* mOrigPtr = nullptr;
         
     public:
-        PointerAccess(T* ptr, T* origPtr) : mPtr(ptr), mOrigPtr(origPtr) {}
+        PointerAccess(T* ptr, T* origPtr) : mPtr(ptr), mOrigPtr(origPtr)
+	{ assert(mPtr != nullptr); assert(mOrigPtr != nullptr); }
 	PointerAccess(const PointerAccess& in) = default;
 	PointerAccess(PointerAccess&& in) = default;
 	PointerAccess& operator=(const PointerAccess& in) = default;
 	PointerAccess& operator=(PointerAccess&& in) = default;
-        
+
         T* get(size_t pos) { return mPtr+pos; }
         T* get(size_t pos) const { return mPtr+pos; }
         PointerAccess<T>& set(size_t pos) { mPtr = mOrigPtr + pos; return *this; }
@@ -292,7 +300,7 @@ namespace MultiArrayTools
 
         Target mTar;
         OpClass mSec;
-	AccessTemplate<AT> mDataAcc;
+	AT mDataAcc;
         T* mDataPtr;
             
     public: