From 8ca9a7014d3e5d16da7d798d56dd8ac99b82dae2 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Wed, 28 Nov 2018 20:37:16 -0500
Subject: [PATCH] solved some more compiler problems

---
 dune/multimesh/mmhierarchiciterator.hh |  1 -
 src/CMakeLists.txt                     | 19 ++-----------------
 src/interpolation.hh                   |  2 +-
 test/CMakeLists.txt                    |  5 ++++-
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/dune/multimesh/mmhierarchiciterator.hh b/dune/multimesh/mmhierarchiciterator.hh
index 8021243..9981f34 100644
--- a/dune/multimesh/mmhierarchiciterator.hh
+++ b/dune/multimesh/mmhierarchiciterator.hh
@@ -5,7 +5,6 @@
 
 #include <numeric>
 #include <stack>
-#include <variant>
 
 #include <dune/common/iteratorfacades.hh>
 #include <dune/common/iteratorrange.hh>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a67b834..33225dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,27 +40,12 @@ if (dune-functions_FOUND AND dune-alugrid_FOUND AND HAVE_ALBERTA)
 
   find_package(MTL QUIET PATHS /opt/development/mtl4)
   if (MTL_FOUND)
-    set(CXX_ELEVEN_FEATURE_LIST "MOVE" "AUTO" "RANGEDFOR" "INITLIST" "STATICASSERT" "DEFAULTIMPL")
-    set(MTL_COMPILE_DEFINITIONS "")
-    foreach(feature ${CXX_ELEVEN_FEATURE_LIST})
-      list(APPEND MTL_COMPILE_DEFINITIONS "MTL_WITH_${feature}")
-    endforeach()
-
-    if (HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND)
-      list(APPEND MTL_COMPILE_DEFINITIONS "MTL_HAS_UMFPACK")
-    endif ()
-
-    set(MTL_TARGETS "")
-    list(APPEND MTL_TARGETS "phasefield" "phasefield2" "phasefield3" "phasefield4")
-
-    foreach(target ${MTL_TARGETS})
+    foreach(target "phasefield" "phasefield2" "phasefield3" "phasefield4")
       add_executable(${target} ${target}.cc)
       target_link_dune_default_libraries(${target})
       add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 ${target})
       target_include_directories(${target} PRIVATE ${MTL_INCLUDE_DIRS})
       target_compile_definitions(${target} PRIVATE ${MTL_COMPILE_DEFINITIONS})
-      target_compile_options(${target} PRIVATE -Wno-deprecated-declarations)
     endforeach()
-
-  endif ()
+  endif (MTL_FOUND)
 endif ()
\ No newline at end of file
diff --git a/src/interpolation.hh b/src/interpolation.hh
index 63da9f9..e0022a1 100644
--- a/src/interpolation.hh
+++ b/src/interpolation.hh
@@ -57,7 +57,7 @@ namespace Dune
           auto oldSubLocalView = Dune::Functions::subspaceBasis(oldBasis, treePath).localView();
           auto newSubLocalView = Dune::Functions::subspaceBasis(newBasis, treePath).localView();
 
-          interpolate(oldCoeff, oldEntity, oldSubLocalView, newCoeff, newEntity, newSubLocalView);
+          this->interpolate(oldCoeff, oldEntity, oldSubLocalView, newCoeff, newEntity, newSubLocalView);
         });
       }
     }
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c086a04..2e6106f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,7 @@
 dune_add_test(SOURCES testvolume.cc)
 dune_add_test(SOURCES testnumentities.cc)
 dune_add_test(SOURCES testtransform.cc)
-dune_add_test(SOURCES testgridviews.cc)
\ No newline at end of file
+
+if (DUNE_HAVE_CXX_VARIANT)
+  dune_add_test(SOURCES testgridviews.cc)
+endif (DUNE_HAVE_CXX_VARIANT)
\ No newline at end of file
-- 
GitLab