Merge branch 'icc_without_make_functions_copyable' of...

Merge branch 'icc_without_make_functions_copyable' of zivgitlab.uni-muenster.de:ag-ohlberger/dune-community/dune-xt into fix_compilation_with_icc

dune/xt/common/unused.hh

@@ -24,4 +24,10 @@
 #  define DXTC_DEBUG_ONLY(param) DXTC_UNUSED(param)
 #endif
 
+#if defined(HAVE_MPI) && HAVE_MPI
+#  define DXTC_MPI_ONLY(param) param
+#else
+#  define DXTC_MPI_ONLY(param) DXTC_UNUSED(param)
+#endif
+
 #endif // DXTC_UNUSED_HH

dune/xt/grid/structuredgridfactory.hh

@@ -15,8 +15,6 @@
 
 #include <memory>
 
-#include <dune/common/unused.hh>
-
 #include <dune/grid/utility/structuredgridfactory.hh>
 #include <dune/grid/yaspgrid.hh>
 
@@ -37,8 +35,9 @@
 #endif
 
 #include <dune/xt/common/float_cmp.hh>
-#include <dune/xt/common/ranges.hh>
 #include <dune/xt/common/logging.hh>
+#include <dune/xt/common/ranges.hh>
+#include <dune/xt/common/unused.hh>
 
 namespace Dune {
 
@@ -170,7 +169,7 @@ public:
                  const Dune::FieldVector<ctype, GridType::dimension>& upperRight,
                  const std::array<unsigned int, GridType::dimension>& elements,
                  std::array<unsigned int, GridType::dimension> = default_overlap<GridType>(),
-                 Dune::MPIHelper::MPICommunicator mpi_comm = Dune::MPIHelper::getCommunicator())
+                 Dune::MPIHelper::MPICommunicator DXTC_MPI_ONLY(mpi_comm) = Dune::MPIHelper::getCommunicator())
   {
     if (Dune::MPIHelper::isFake)
       return Dune::StructuredGridFactory<GridType>::createCubeGrid(lowerLeft, upperRight, elements);
@@ -185,7 +184,7 @@ public:
   createSimplexGrid(const Dune::FieldVector<ctype, dim>& lowerLeft,
                     const Dune::FieldVector<ctype, dim>& upperRight,
                     const std::array<unsigned int, dim>& elements,
-                    Dune::MPIHelper::MPICommunicator mpi_comm = Dune::MPIHelper::getCommunicator())
+                    Dune::MPIHelper::MPICommunicator DXTC_MPI_ONLY(mpi_comm) = Dune::MPIHelper::getCommunicator())
   {
     if (Dune::MPIHelper::isFake)
       return Dune::StructuredGridFactory<GridType>::createSimplexGrid(lowerLeft, upperRight, elements);
@@ -211,7 +210,7 @@ public:
                  const Dune::FieldVector<ctype, GridType::dimension>& upperRight,
                  const std::array<unsigned int, GridType::dimension>& elements,
                  std::array<unsigned int, GridType::dimension> overlap = default_overlap<GridType>(),
-                 Dune::MPIHelper::MPICommunicator mpi_comm = Dune::MPIHelper::getCommunicator())
+                 Dune::MPIHelper::MPICommunicator DXTC_MPI_ONLY(mpi_comm) = Dune::MPIHelper::getCommunicator())
   {
     bool warn = false;
     unsigned int sum = 0;
@@ -234,7 +233,7 @@ public:
   createSimplexGrid(const Dune::FieldVector<ctype, dim>& lowerLeft,
                     const Dune::FieldVector<ctype, dim>& upperRight,
                     const std::array<unsigned int, dim>& elements,
-                    Dune::MPIHelper::MPICommunicator mpi_comm = Dune::MPIHelper::getCommunicator())
+                    Dune::MPIHelper::MPICommunicator DXTC_MPI_ONLY(mpi_comm) = Dune::MPIHelper::getCommunicator())
   {
     if (Dune::MPIHelper::isFake)
       return Dune::StructuredGridFactory<GridType>::createSimplexGrid(lowerLeft, upperRight, elements);
@@ -262,11 +261,7 @@ public:
                  const Dune::FieldVector<ctype, GridType::dimension>& upperRight,
                  const std::array<unsigned int, GridType::dimension>& elements,
                  std::array<unsigned int, GridType::dimension> = default_overlap<GridType>(),
-                 Dune::MPIHelper::MPICommunicator
-#  if HAVE_MPI
-                     mpi_comm
-#  endif
-                 = Dune::MPIHelper::getCommunicator())
+                 Dune::MPIHelper::MPICommunicator DXTC_MPI_ONLY(mpi_comm) = Dune::MPIHelper::getCommunicator())
   {
     if (Dune::MPIHelper::isFake)
       return Dune::StructuredGridFactory<GridType>::createCubeGrid(lowerLeft, upperRight, elements);