From 23078a8b2dcd4d1183a5616371b0c8c20754d234 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Mon, 20 May 2019 18:32:19 +0200
Subject: [PATCH] return type of Operation -> auto

---
 src/include/multi_array_operation.cc.h |  4 ++--
 src/include/multi_array_operation.h    |  2 +-
 src/include/pack_num.h                 | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/include/multi_array_operation.cc.h b/src/include/multi_array_operation.cc.h
index 1bb8393..919d1e7 100644
--- a/src/include/multi_array_operation.cc.h
+++ b/src/include/multi_array_operation.cc.h
@@ -631,11 +631,11 @@ namespace MultiArrayTools
 
     template <typename T, class OpFunction, class... Ops>
     template <class ET>
-    inline T Operation<T,OpFunction,Ops...>::get(ET pos) const
+    inline auto Operation<T,OpFunction,Ops...>::get(ET pos) const
     {
 	typedef std::tuple<Ops...> OpTuple;
 	return PackNum<sizeof...(Ops)-1>::
-	    template mkOpExpr<SIZE,T,ET,OpTuple,OpFunction>(mF, pos, mOps);
+	    template mkOpExpr<SIZE,ET,OpTuple,OpFunction>(mF, pos, mOps);
     }
 
     template <typename T, class OpFunction, class... Ops>
diff --git a/src/include/multi_array_operation.h b/src/include/multi_array_operation.h
index ac4d6b7..4d88ad1 100644
--- a/src/include/multi_array_operation.h
+++ b/src/include/multi_array_operation.h
@@ -506,7 +506,7 @@ namespace MultiArrayTools
 	Operation(std::shared_ptr<OpFunction> ff, const Ops&... ops);
 	
 	template <class ET>
-	inline T get(ET pos) const;
+	inline auto get(ET pos) const;
 
 	template <class ET>
 	inline Operation& set(ET pos);
diff --git a/src/include/pack_num.h b/src/include/pack_num.h
index 590246c..2797243 100644
--- a/src/include/pack_num.h
+++ b/src/include/pack_num.h
@@ -70,14 +70,14 @@ namespace MultiArrayHelper
 	    PackNum<N-1>::mkExt(out, siar, second);
 	}
 
-	template <size_t LAST, typename T, class ETuple, class OpTuple, class OpFunction, typename... Args>
-	static inline T mkOpExpr(std::shared_ptr<OpFunction> f, const ETuple& pos, const OpTuple& ops, Args... args)
+	template <size_t LAST, class ETuple, class OpTuple, class OpFunction, typename... Args>
+	static inline auto mkOpExpr(std::shared_ptr<OpFunction> f, const ETuple& pos, const OpTuple& ops, Args... args)
 	{
 	    typedef typename std::remove_reference<decltype(std::get<N>(ops))>::type NextOpType;
 	    static_assert(LAST >= NextOpType::SIZE, "inconsistent array positions");
 	    static constexpr size_t NEXT = LAST - NextOpType::SIZE;
 	    typedef decltype(std::get<N>(ops).get(Getter<NEXT>::template getX<ETuple>( pos ))) ArgT;
-	    return PackNum<N-1>::template mkOpExpr<NEXT,T,ETuple,OpTuple,OpFunction,ArgT,Args...>
+	    return PackNum<N-1>::template mkOpExpr<NEXT,ETuple,OpTuple,OpFunction,ArgT,Args...>
 		( f, pos, ops, std::get<N>(ops).get(Getter<NEXT>::template getX<ETuple>( pos )), args...);
 	}
 
@@ -157,8 +157,8 @@ namespace MultiArrayHelper
 	    std::get<0>(out) = second.rootSteps( std::get<0>(siar) );
 	}
 	
-	template <size_t LAST, typename T, class ETuple, class OpTuple, class OpFunction, typename... Args>
-	static inline T mkOpExpr(std::shared_ptr<OpFunction> f, const ETuple& pos, const OpTuple& ops, const Args&... args)
+	template <size_t LAST, class ETuple, class OpTuple, class OpFunction, typename... Args>
+	static inline auto mkOpExpr(std::shared_ptr<OpFunction> f, const ETuple& pos, const OpTuple& ops, const Args&... args)
 	{
 	    typedef typename std::remove_reference<decltype(std::get<0>(ops))>::type NextOpType;
 	    static constexpr size_t NEXT = LAST - NextOpType::SIZE;