From 64c5c2b4f30b361fc9dff0b7a5dbe521a77388a1 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Sat, 10 Apr 2021 13:25:43 +0200
Subject: [PATCH] -> C++17

---
 CMakeLists.txt                      |  2 +-
 src/include/extensions/math.h       | 24 ------------------------
 src/include/multi_array_operation.h | 13 +------------
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bacd260..5626d0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ else()
   message(WARNING "compiler ${CMAKE_CXX_COMPILER_ID} officially not supported")
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++14 -Wpedantic -Ofast -march=native -faligned-new -funroll-loops -fopenmp")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++17 -Wpedantic -Ofast -march=native -faligned-new -funroll-loops -fopenmp")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++14 -g -Wpedantic -Ofast -march=native -faligned-new -funroll-loops -fopenmp -ftemplate-backtrace-limit=0")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++14 -g -Wpedantic -O0 -march=native -faligned-new -funroll-loops -fopenmp")
 
diff --git a/src/include/extensions/math.h b/src/include/extensions/math.h
index 5887bf3..b1f9183 100644
--- a/src/include/extensions/math.h
+++ b/src/include/extensions/math.h
@@ -2,29 +2,5 @@
 #ifdef regFunc1
 
 regFunc1(exp)
-regFunc1(exp2)
-regFunc1(expm1)
-regFunc1(log)
-regFunc1(log10)
-regFunc1(log2)
-regFunc1(log1p)
-regFunc1(sqrt)
-regFunc1(cbrt)
-regFunc1(sin)
-regFunc1(cos)
-regFunc1(tan)
-regFunc1(asin)
-regFunc1(acos)
-regFunc1(atan)
-regFunc1(sinh)
-regFunc1(cosh)
-regFunc1(tanh)
-regFunc1(asinh)
-regFunc1(acosh)
-regFunc1(atanh)
-regFunc1(erf)
-regFunc1(erfc)
-regFunc1(tgamma)
-regFunc1(lgamma)
 
 #endif
diff --git a/src/include/multi_array_operation.h b/src/include/multi_array_operation.h
index 6e852f7..7837db6 100644
--- a/src/include/multi_array_operation.h
+++ b/src/include/multi_array_operation.h
@@ -102,18 +102,6 @@ namespace MultiArrayTools
 	friend OperationClass;
     };
 
-    template <class Op>
-    size_t sumRootNum()
-    {
-	return typename Op::rootNum();
-    }
-    
-    template <class Op1, class Op2, class... Ops>
-    size_t sumRootNum()
-    {
-	return typename Op1::rootNum() + sumRootNum<Op2,Ops...>();
-    }
-
     template <size_t N>
     struct RootSumN
     {
@@ -190,6 +178,7 @@ namespace MultiArrayTools
     template <class... Ops>
     struct RootSum
     {
+	//static constexpr size_t SIZE = (... + Ops::SIZE);
 	static constexpr size_t SIZE = RootSumN<sizeof...(Ops)-1>::template rs<Ops...>::SIZE;
     };