From c73fa76051ebd00a90f913a6189550fbf63e35d1 Mon Sep 17 00:00:00 2001
From: Uli Sack <usack@math.fu-berlin.de>
Date: Mon, 16 Sep 2013 13:42:08 +0000
Subject: [PATCH] no need for this->NORMTYPE::, as normSquared is a direct
member not just inherited
[[Imported from SVN: r12160]]
---
dune/solvers/norms/diagnorm.hh | 4 ++--
dune/solvers/norms/energynorm.hh | 2 +-
dune/solvers/norms/fullnorm.hh | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dune/solvers/norms/diagnorm.hh b/dune/solvers/norms/diagnorm.hh
index e438ce68..c5fc0cee 100644
--- a/dune/solvers/norms/diagnorm.hh
+++ b/dune/solvers/norms/diagnorm.hh
@@ -34,7 +34,7 @@ class DiagNorm:
//! Compute the norm of the given vector
field_type operator()(const VectorType &f) const
{
- return std::sqrt(this->DiagNorm<Diagonal,VectorType>::normSquared(f));
+ return std::sqrt(normSquared(f));
}
//! Compute the square of the norm of the given vector
@@ -93,7 +93,7 @@ class DiagNorm<Dune::BlockVector<Dune::FieldVector <double,1> >, Dune::BlockVect
//! Compute the norm of the given vector
field_type operator()(const VectorType &f) const
{
- return std::sqrt(this->DiagNorm<>::normSquared(f));
+ return std::sqrt(normSquared(f));
}
//! Compute the square of the norm of the given vector
diff --git a/dune/solvers/norms/energynorm.hh b/dune/solvers/norms/energynorm.hh
index 4726bc65..e93981eb 100644
--- a/dune/solvers/norms/energynorm.hh
+++ b/dune/solvers/norms/energynorm.hh
@@ -63,7 +63,7 @@
//! Compute the norm of the given vector
field_type operator()(const VectorType& f) const
{
- return std::sqrt(this->EnergyNorm<OperatorType,VectorType>::normSquared(f));
+ return std::sqrt(normSquared(f));
}
// \brief Compute the square of the norm of the given vector
diff --git a/dune/solvers/norms/fullnorm.hh b/dune/solvers/norms/fullnorm.hh
index d4f9f93b..ff7d34b6 100644
--- a/dune/solvers/norms/fullnorm.hh
+++ b/dune/solvers/norms/fullnorm.hh
@@ -33,7 +33,7 @@ class FullNorm: public Norm<V>
//! Compute the norm of the given vector
field_type operator()(const VectorType &f) const
{
- return std::sqrt(this->FullNorm<LowRankFactor,VectorType>::normSquared(f));
+ return std::sqrt(normSquared(f));
}
//! Compute the square of the norm of the given vector
@@ -86,7 +86,7 @@ class FullNorm<Dune::BlockVector<Dune::FieldVector<double,1> >, Dune::BlockVecto
//! Compute the norm of the given vector
field_type operator()(const VectorType &f) const
{
- return std::sqrt(this->FullNorm<>::normSquared(f));
+ return std::sqrt(normSquared(f));
}
//! Compute the square of the norm of the given vector
--
GitLab