From 70c23199979e6c72157082732beb3a66213cf97a Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Fri, 17 May 2019 13:44:57 +0200
Subject: [PATCH] Make compile with dune-grid 2.6 again
I forgot the GridFactory::createGrid did return a plain pointer
as recently as dune-grid 2.6.
---
test/localgeodesicfestiffnesstest.cc | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/test/localgeodesicfestiffnesstest.cc b/test/localgeodesicfestiffnesstest.cc
index edc57ad2..574a4d78 100644
--- a/test/localgeodesicfestiffnesstest.cc
+++ b/test/localgeodesicfestiffnesstest.cc
@@ -1,5 +1,7 @@
#include "config.h"
+#include <dune/common/version.hh>
+
#include <dune/grid/uggrid.hh>
#include <dune/grid/onedgrid.hh>
@@ -65,7 +67,11 @@ energy(const typename Basis::LocalView& localView,
template <int domainDim>
+#if DUNE_VERSION_LT(DUNE_FUNCTIONS,2,7)
+GridType* makeTestGrid()
+#else
std::unique_ptr<GridType> makeTestGrid()
+#endif
{
// ////////////////////////////////////////////////////////
// Make a test grid consisting of a single simplex
@@ -101,7 +107,11 @@ std::unique_ptr<GridType> makeTestGrid()
template <class TargetSpace, int domainDim>
void testHessian()
{
+#if DUNE_VERSION_LT(DUNE_FUNCTIONS,2,7)
+ const GridType* grid = makeTestGrid<domainDim>();
+#else
std::unique_ptr<const GridType> grid = makeTestGrid<domainDim>();
+#endif
const int spaceDim = TargetSpace::TangentVector::dimension;
const int embeddedSpaceDim = TargetSpace::EmbeddedTangentVector::dimension;
--
GitLab