From f47d3fdb8a6d9a1d9d62c9c7c2441bd4dcdf0da0 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Tue, 19 Feb 2019 16:27:50 +0100
Subject: [PATCH] try fix reg last com

---
 src/include/multi_array_operation.cc.h | 7 +++----
 src/include/multi_array_operation.h    | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/include/multi_array_operation.cc.h b/src/include/multi_array_operation.cc.h
index 86b77d4..58dfc48 100644
--- a/src/include/multi_array_operation.cc.h
+++ b/src/include/multi_array_operation.cc.h
@@ -98,14 +98,13 @@ namespace MultiArrayTools
     }
 
     template <typename T, class OperationClass>
-    template <class AOp, class... Indices>
-    auto OperationBase<T,OperationClass>::oto(const AOp& aop,
-                                              const std::shared_ptr<Indices>&... inds) const
+    template <template <class,class> class AOp, class... Indices>
+    auto OperationBase<T,OperationClass>::oto(const std::shared_ptr<Indices>&... inds) const
 	-> MultiArray<T,typename Indices::RangeType...>
     {
 	MultiArray<T,typename Indices::RangeType...> out(inds->range()...,
                                                          static_cast<T>(0));
-        AOp::selfApply(out(inds...), THIS());
+        AOp<decltype(out(inds...)),decltype(THIS())>::selfApply(out(inds...), THIS());
 	return out;
     }
 
diff --git a/src/include/multi_array_operation.h b/src/include/multi_array_operation.h
index 143129a..3137df5 100644
--- a/src/include/multi_array_operation.h
+++ b/src/include/multi_array_operation.h
@@ -69,8 +69,8 @@ namespace MultiArrayTools
 	auto to(const std::shared_ptr<Indices>&... inds) const
 	    -> MultiArray<T,typename Indices::RangeType...>;
 
-        template <class AOp, class... Indices>
-	auto oto(const AOp& aop, const std::shared_ptr<Indices>&... inds) const
+        template <template <class,class> class AOp, class... Indices>
+	auto oto(const std::shared_ptr<Indices>&... inds) const
 	    -> MultiArray<T,typename Indices::RangeType...>;
 
         template <typename R, class... Args> // Args = Operation Classes