From acf3e283029caf835e6d4174f96df46dbb7bd2f0 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Tue, 20 Apr 2021 07:34:54 +0200
Subject: [PATCH] Replace DUNE_UNUSED by [[maybe_unused]]
* adapt to changes in dune-common
* fix deprecation warnings
---
dune/subgrid/subgrid.hh | 2 +-
dune/subgrid/subgrid/subgridhierarchiciterator.hh | 2 +-
dune/subgrid/subgrid/subgridindexstorage.hh | 8 ++++----
dune/subgrid/subgrid/subgridleafiterator.hh | 2 +-
dune/subgrid/subgrid/subgridleveliterator.hh | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dune/subgrid/subgrid.hh b/dune/subgrid/subgrid.hh
index 99bdb45..7405c29 100644
--- a/dune/subgrid/subgrid.hh
+++ b/dune/subgrid/subgrid.hh
@@ -335,7 +335,7 @@ class SubGrid :
/** global refinement
* \todo optimize implementation
*/
- void globalRefine (int refCount DUNE_UNUSED)
+ void globalRefine ([[maybe_unused]] int refCount)
{
for (auto&& e : elements(this->leafGridView()))
mark(1, e);
diff --git a/dune/subgrid/subgrid/subgridhierarchiciterator.hh b/dune/subgrid/subgrid/subgridhierarchiciterator.hh
index 5c2e28d..b3d939c 100644
--- a/dune/subgrid/subgrid/subgridhierarchiciterator.hh
+++ b/dune/subgrid/subgrid/subgridhierarchiciterator.hh
@@ -57,7 +57,7 @@ class SubGridHierarchicIterator :
*
* \param endDummy Here only to distinguish it from the other constructor
*/
- explicit SubGridHierarchicIterator(const GridImp* subGrid, const SubGridElement& startEntity, int maxLevel, bool endDummy DUNE_UNUSED) :
+ explicit SubGridHierarchicIterator(const GridImp* subGrid, const SubGridElement& startEntity, int maxLevel, [[maybe_unused]] bool endDummy) :
Base(subGrid, startEntity.hostEntity().hend(maxLevel)),
hostHierarchicEndIterator_(hostIterator_)
{}
diff --git a/dune/subgrid/subgrid/subgridindexstorage.hh b/dune/subgrid/subgrid/subgridindexstorage.hh
index e273fc9..95892e8 100644
--- a/dune/subgrid/subgrid/subgridindexstorage.hh
+++ b/dune/subgrid/subgrid/subgridindexstorage.hh
@@ -180,7 +180,7 @@ class SubGridIndexStorageBase
//! get multilevel geometry type counter for given geometry type for usage on given level
- MultilevelCounter& getGeometryTypeCountForLevel(const GeometryType& gt, int level DUNE_UNUSED)
+ MultilevelCounter& getGeometryTypeCountForLevel(const GeometryType& gt, [[maybe_unused]] int level)
{
// Is this the first time we see this kind of entity?
auto countIt = numEntities.find(gt);
@@ -196,7 +196,7 @@ class SubGridIndexStorageBase
return countIt->second;
}
- const MultilevelCounter& getGeometryTypeCountForLevel(const GeometryType& gt, int level DUNE_UNUSED) const
+ const MultilevelCounter& getGeometryTypeCountForLevel(const GeometryType& gt, [[maybe_unused]] int level) const
{
return numEntities.find(gt)->second;
}
@@ -571,7 +571,7 @@ class SubGridMapSubindexSetter<GridType,0>
typedef typename std::remove_const<GridType>::type::template Codim<0>::Entity Element;
- static void insertSubEntities(SubGridMapIndexStorage<GridType>& indexStorage DUNE_UNUSED, const Element& e DUNE_UNUSED, bool isLeaf DUNE_UNUSED, int level DUNE_UNUSED)
+ static void insertSubEntities([[maybe_unused]] SubGridMapIndexStorage<GridType>& indexStorage, [[maybe_unused]] const Element& e, [[maybe_unused]] bool isLeaf, [[maybe_unused]] int level)
{};
};
@@ -951,7 +951,7 @@ class SubGridVectorSubindexSetter<GridType,0>
typedef typename std::remove_const<GridType>::type::template Codim<0>::Entity Element;
- static void insertSubEntities(SubGridVectorIndexStorage<GridType>& indexStorage DUNE_UNUSED, const Element& e DUNE_UNUSED, bool isLeaf DUNE_UNUSED, int level DUNE_UNUSED)
+ static void insertSubEntities([[maybe_unused]] SubGridVectorIndexStorage<GridType>& indexStorage, [[maybe_unused]] const Element& e, [[maybe_unused]] bool isLeaf, [[maybe_unused]] int level)
{};
};
diff --git a/dune/subgrid/subgrid/subgridleafiterator.hh b/dune/subgrid/subgrid/subgridleafiterator.hh
index 4524a97..ba1535b 100644
--- a/dune/subgrid/subgrid/subgridleafiterator.hh
+++ b/dune/subgrid/subgrid/subgridleafiterator.hh
@@ -64,7 +64,7 @@ class SubGridLeafIterator :
*
* \param endDummy Here only to distinguish it from the other constructor
*/
- explicit SubGridLeafIterator(const GridImp* subGrid, bool endDummy DUNE_UNUSED) :
+ explicit SubGridLeafIterator(const GridImp* subGrid, [[maybe_unused]] bool endDummy) :
Base(subGrid, subGrid->getHostGrid().levelGridView(subGrid->maxLevel()).template end<codim>()),
hostLevelEndIterator_(subGrid->getHostGrid().levelGridView(0).template end<codim>()),
level_(0)
diff --git a/dune/subgrid/subgrid/subgridleveliterator.hh b/dune/subgrid/subgrid/subgridleveliterator.hh
index f915227..36964e3 100644
--- a/dune/subgrid/subgrid/subgridleveliterator.hh
+++ b/dune/subgrid/subgrid/subgridleveliterator.hh
@@ -52,10 +52,10 @@ class SubGridLevelIterator :
/**
* \brief Constructor which create the end iterator
- *
+ *
* \param endDummy Here only to distinguish it from the other constructor
*/
- explicit SubGridLevelIterator(const GridImp* subGrid, int level, bool endDummy DUNE_UNUSED) :
+ explicit SubGridLevelIterator(const GridImp* subGrid, int level, [[maybe_unused]] bool endDummy) :
Base(subGrid, subGrid->getHostGrid().levelGridView(level).template end<codim>()),
hostLevelEndIterator_(hostIterator_)
{}
--
GitLab