From 0babaa5a8af04453a94494a807dc490981d3bf6f Mon Sep 17 00:00:00 2001
From: Max Kahnt <max.kahnt@fu-berlin.de>
Date: Thu, 20 Nov 2014 10:36:41 +0100
Subject: [PATCH] Fix compiler warnings. Add DUNE_UNUSED flag.
---
dune/fufem/dunedataio.hh | 6 +++---
dune/fufem/estimators/errorfractionmarking.hh | 2 +-
dune/fufem/functions/portablegreymap.hh | 4 ++--
dune/fufem/functionspacebases/q1nodalbasis.hh | 2 +-
dune/fufem/functionspacebases/refinedp1nodalbasis.hh | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dune/fufem/dunedataio.hh b/dune/fufem/dunedataio.hh
index a29957c2..8d086eb3 100644
--- a/dune/fufem/dunedataio.hh
+++ b/dune/fufem/dunedataio.hh
@@ -16,7 +16,7 @@ namespace serialization {
* mark the use of the operator & that works both ways, << or >> , depending on the type of Archive.
*/
template <class Archive, class T, int n>
-void serialize(Archive& ar, Dune::FieldVector<T,n>& fvec, const unsigned int version)
+void serialize(Archive& ar, Dune::FieldVector<T,n>& fvec, const unsigned int version DUNE_UNUSED)
{
for (int i=0; i<n; ++i)
ar & fvec[i];
@@ -26,7 +26,7 @@ void serialize(Archive& ar, Dune::FieldVector<T,n>& fvec, const unsigned int ver
* two separate save() and load() functions later to be "unified" via boost::serialization::split_free (see below)
*/
template <class Archive, class BlockType>
-void save(Archive& ar, const Dune::BlockVector<BlockType>& vec, const unsigned int version)
+void save(Archive& ar, const Dune::BlockVector<BlockType>& vec, const unsigned int version DUNE_UNUSED)
{
size_t size = vec.size();
ar << size;
@@ -35,7 +35,7 @@ void save(Archive& ar, const Dune::BlockVector<BlockType>& vec, const unsigned i
}
template <class Archive, class BlockType>
-void load(Archive& ar, Dune::BlockVector<BlockType>& vec, const unsigned int version)
+void load(Archive& ar, Dune::BlockVector<BlockType>& vec, const unsigned int version DUNE_UNUSED)
{
size_t size;
ar >> size;
diff --git a/dune/fufem/estimators/errorfractionmarking.hh b/dune/fufem/estimators/errorfractionmarking.hh
index bab90bcc..1f0d7bae 100644
--- a/dune/fufem/estimators/errorfractionmarking.hh
+++ b/dune/fufem/estimators/errorfractionmarking.hh
@@ -36,7 +36,7 @@ class ErrorFractionMarkingStrategy
template<int localDim>
struct AllCodimLayout
{
- bool contains (Dune::GeometryType gt) const
+ bool contains (Dune::GeometryType gt DUNE_UNUSED) const
{
return true;
}
diff --git a/dune/fufem/functions/portablegreymap.hh b/dune/fufem/functions/portablegreymap.hh
index b6517a13..0785b279 100644
--- a/dune/fufem/functions/portablegreymap.hh
+++ b/dune/fufem/functions/portablegreymap.hh
@@ -374,7 +374,7 @@ class PortableGreyMap:
* \param x point (global coordinates) at which to evaluate the derivative
* \param d will contain the derivative at x after return
*/
- virtual void evaluateDerivative(const DomainType& x, DerivativeType& d) const
+ virtual void evaluateDerivative(const DomainType& x DUNE_UNUSED, DerivativeType& d DUNE_UNUSED) const
{
DUNE_THROW(Dune::NotImplemented, "Derivative not implemented");
}
@@ -385,7 +385,7 @@ class PortableGreyMap:
* \param x point in local coordinates at which to evaluate the derivative
* \param d will contain the derivative at x after return
*/
- virtual void evaluateDerivativeLocal(const Element& e, const LocalDomainType& x, DerivativeType& d) const
+ virtual void evaluateDerivativeLocal(const Element& e DUNE_UNUSED, const LocalDomainType& x DUNE_UNUSED, DerivativeType& d DUNE_UNUSED) const
{
DUNE_THROW(Dune::NotImplemented, "Derivative not implemented");
}
diff --git a/dune/fufem/functionspacebases/q1nodalbasis.hh b/dune/fufem/functionspacebases/q1nodalbasis.hh
index bd28259d..368877b5 100644
--- a/dune/fufem/functionspacebases/q1nodalbasis.hh
+++ b/dune/fufem/functionspacebases/q1nodalbasis.hh
@@ -47,7 +47,7 @@ class Q1NodalBasis :
return gridview_.indexSet().size(dim);
}
- const LocalFiniteElement& getLocalFiniteElement(const Element& e) const
+ const LocalFiniteElement& getLocalFiniteElement(const Element& e DUNE_UNUSED) const
{
return localFE_;
}
diff --git a/dune/fufem/functionspacebases/refinedp1nodalbasis.hh b/dune/fufem/functionspacebases/refinedp1nodalbasis.hh
index 7c308061..c907f638 100644
--- a/dune/fufem/functionspacebases/refinedp1nodalbasis.hh
+++ b/dune/fufem/functionspacebases/refinedp1nodalbasis.hh
@@ -55,7 +55,7 @@ class RefinedP1NodalBasis :
mapper_.update();
}
- const LocalFiniteElement& getLocalFiniteElement(const Element& e) const
+ const LocalFiniteElement& getLocalFiniteElement(const Element& e DUNE_UNUSED) const
{
return fe_;
}
--
GitLab