From 19de6b29d319ec3bf0e22bd696840acb5e18e73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20M=C3=BCller?= <felix.mueller2@mailbox.tu-dresden.de>
Date: Wed, 11 Nov 2020 16:13:54 +0100
Subject: [PATCH 1/2] Remove empty else clause; Add include

---
 amdis/MeshCreator.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amdis/MeshCreator.hpp b/amdis/MeshCreator.hpp
index 64756f12..002f8646 100644
--- a/amdis/MeshCreator.hpp
+++ b/amdis/MeshCreator.hpp
@@ -24,6 +24,7 @@
 #if HAVE_DUNE_GMSH4
 #include <dune/gmsh4/gmsh4reader.hh>
 #include <dune/gmsh4/gridcreators/lagrangegridcreator.hh>
+#include <dune/gmsh4/utility/version.hh>
 #endif
 
 #include <amdis/AdaptiveGrid.hpp>
@@ -186,7 +187,6 @@ namespace AMDiS
 #if HAVE_DUNE_GMSH4
         if (Dune::Gmsh4::fileVersion(filename)[0] >= 4)
           return Dune::Gmsh4Reader<HostGrid, Dune::Gmsh4::LagrangeGridCreator<HostGrid>>::createGridFromFile(filename);
-        else
 #else
         return read_gmsh_file<HostGrid>(filename, Dune::PriorityTag<42>{});
 #endif
-- 
GitLab


From 4c8a86dd9532fc7fdc75d112309cb4ba572e30d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=BCller=2C=20Felix?=
 <felix.mueller2@mailbox.tu-dresden.de>
Date: Wed, 11 Nov 2020 17:15:56 +0100
Subject: [PATCH 2/2] Fix control reaches end of non-void function

---
 amdis/MeshCreator.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/amdis/MeshCreator.hpp b/amdis/MeshCreator.hpp
index 002f8646..c89fb352 100644
--- a/amdis/MeshCreator.hpp
+++ b/amdis/MeshCreator.hpp
@@ -187,9 +187,9 @@ namespace AMDiS
 #if HAVE_DUNE_GMSH4
         if (Dune::Gmsh4::fileVersion(filename)[0] >= 4)
           return Dune::Gmsh4Reader<HostGrid, Dune::Gmsh4::LagrangeGridCreator<HostGrid>>::createGridFromFile(filename);
-#else
-        return read_gmsh_file<HostGrid>(filename, Dune::PriorityTag<42>{});
+        else
 #endif
+        return read_gmsh_file<HostGrid>(filename, Dune::PriorityTag<42>{});
       }
 #if HAVE_DUNE_VTK
       else if (ext == ".vtu") {
-- 
GitLab