From 847dcd0848f9b876c72e34f95bd1dcc5437096f3 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <Ansgar.Burchardt@tu-dresden.de>
Date: Thu, 26 May 2016 15:19:46 +0200
Subject: [PATCH] Remove `template` keyword before non-template member function

The `levelGridView` and `leafGridView` member functions are no
templates.  The Intel C++ compiler doesn't like them to be called as
such:

```
dune-grid/dune/grid/utility/hierarchicsearch.hh(142): error: no instance of overloaded function "Dune::UGGrid<dim>::levelGridView [with dim=3]" matches the argument list
            argument types are: (int)
            object type is: const Dune::UGGrid<3>
        const LevelGV &gv = grid_.template levelGridView(0);
```

(ICC 16.0.3 20160415)
---
 dune/grid/io/file/test/nonconformboundaryvtktest.cc |  6 +++---
 dune/grid/io/file/test/vtksequencetest.cc           | 12 ++++++------
 dune/grid/io/file/test/vtktest.cc                   | 12 ++++++------
 dune/grid/utility/hierarchicsearch.hh               |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dune/grid/io/file/test/nonconformboundaryvtktest.cc b/dune/grid/io/file/test/nonconformboundaryvtktest.cc
index d23565498..579597a4f 100644
--- a/dune/grid/io/file/test/nonconformboundaryvtktest.cc
+++ b/dune/grid/io/file/test/nonconformboundaryvtktest.cc
@@ -96,9 +96,9 @@ void vtkCheck(const std::array<int,dim>& n,
   Dune::YaspGrid<dim> grid(h, n);
   grid.globalRefine(1);
 
-  doWrite( grid.template leafGridView() );
-  doWrite( grid.template levelGridView( 0 ) );
-  doWrite( grid.template levelGridView( grid.maxLevel() ) );
+  doWrite( grid.leafGridView() );
+  doWrite( grid.levelGridView( 0 ) );
+  doWrite( grid.levelGridView( grid.maxLevel() ) );
 }
 
 int main(int argc, char **argv)
diff --git a/dune/grid/io/file/test/vtksequencetest.cc b/dune/grid/io/file/test/vtksequencetest.cc
index 6ef844b4d..a4bec7af0 100644
--- a/dune/grid/io/file/test/vtksequencetest.cc
+++ b/dune/grid/io/file/test/vtksequencetest.cc
@@ -97,12 +97,12 @@ void vtkCheck(const std::array<int,dim>& n,
   Dune::YaspGrid<dim> g(h, n);
   g.globalRefine(1);
 
-  doWrite( g.template leafGridView(), Dune::VTK::conforming );
-  doWrite( g.template leafGridView(), Dune::VTK::nonconforming );
-  doWrite( g.template levelGridView( 0 ), Dune::VTK::conforming );
-  doWrite( g.template levelGridView( 0 ), Dune::VTK::nonconforming );
-  doWrite( g.template levelGridView( g.maxLevel() ), Dune::VTK::conforming );
-  doWrite( g.template levelGridView( g.maxLevel() ), Dune::VTK::nonconforming );
+  doWrite( g.leafGridView(), Dune::VTK::conforming );
+  doWrite( g.leafGridView(), Dune::VTK::nonconforming );
+  doWrite( g.levelGridView( 0 ), Dune::VTK::conforming );
+  doWrite( g.levelGridView( 0 ), Dune::VTK::nonconforming );
+  doWrite( g.levelGridView( g.maxLevel() ), Dune::VTK::conforming );
+  doWrite( g.levelGridView( g.maxLevel() ), Dune::VTK::nonconforming );
 }
 
 int main(int argc, char **argv)
diff --git a/dune/grid/io/file/test/vtktest.cc b/dune/grid/io/file/test/vtktest.cc
index e16cf69eb..a5801feb1 100644
--- a/dune/grid/io/file/test/vtktest.cc
+++ b/dune/grid/io/file/test/vtktest.cc
@@ -147,15 +147,15 @@ int vtkCheck(const std::array<int, dim>& elements,
 
   int result = 0;
 
-  acc(result, doWrite( g.template leafGridView(), Dune::VTK::conforming ));
-  acc(result, doWrite( g.template leafGridView(), Dune::VTK::nonconforming ));
-  acc(result, doWrite( g.template levelGridView( 0 ),
+  acc(result, doWrite( g.leafGridView(), Dune::VTK::conforming ));
+  acc(result, doWrite( g.leafGridView(), Dune::VTK::nonconforming ));
+  acc(result, doWrite( g.levelGridView( 0 ),
                        Dune::VTK::conforming ));
-  acc(result, doWrite( g.template levelGridView( 0 ),
+  acc(result, doWrite( g.levelGridView( 0 ),
                        Dune::VTK::nonconforming ));
-  acc(result, doWrite( g.template levelGridView( g.maxLevel() ),
+  acc(result, doWrite( g.levelGridView( g.maxLevel() ),
                        Dune::VTK::conforming ));
-  acc(result, doWrite( g.template levelGridView( g.maxLevel() ),
+  acc(result, doWrite( g.levelGridView( g.maxLevel() ),
                        Dune::VTK::nonconforming ));
 
   return result;
diff --git a/dune/grid/utility/hierarchicsearch.hh b/dune/grid/utility/hierarchicsearch.hh
index 5d5f359f9..d605b7186 100644
--- a/dune/grid/utility/hierarchicsearch.hh
+++ b/dune/grid/utility/hierarchicsearch.hh
@@ -136,7 +136,7 @@ namespace Dune
     Entity findEntity(const FieldVector<ct,dimw>& global) const
     {
       typedef typename Grid::LevelGridView LevelGV;
-      const LevelGV &gv = grid_.template levelGridView(0);
+      const LevelGV &gv = grid_.levelGridView(0);
 
       //! type of LevelIterator
       typedef typename LevelGV::template Codim<0>::template Partition<partition>::Iterator LevelIterator;
-- 
GitLab