From 663ff6768bda6c9d7abf6a9198bdf7182fd74393 Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Thu, 31 Jan 2019 22:37:00 +0100
Subject: [PATCH] fix some warnings
---
.../operator-fd-jacobian-assemblers.hh | 6 ++--
dune/gdt/operators/lincomb.hh | 28 +++++++++----------
dune/gdt/tools/local-mass-matrix.hh | 6 ++--
3 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/dune/gdt/local/assembler/operator-fd-jacobian-assemblers.hh b/dune/gdt/local/assembler/operator-fd-jacobian-assemblers.hh
index 666dc970b..bc0c6ba94 100644
--- a/dune/gdt/local/assembler/operator-fd-jacobian-assemblers.hh
+++ b/dune/gdt/local/assembler/operator-fd-jacobian-assemblers.hh
@@ -78,7 +78,8 @@ public:
const VectorType& source_vector,
const LocalElementOperatorType& local_operator,
const XT::Common::Parameter& param = {})
- : source_space_(source_space)
+ : BaseType()
+ , source_space_(source_space)
, range_space_(range_space)
, matrix_(matrix)
, source_vector_(source_vector)
@@ -96,7 +97,8 @@ public:
}
LocalElementOperatorFiniteDifferenceJacobianAssembler(const ThisType& other)
- : source_space_(other.source_space_)
+ : BaseType(other)
+ , source_space_(other.source_space_)
, range_space_(other.range_space_)
, matrix_(other.matrix_)
, source_vector_(other.source_vector_)
diff --git a/dune/gdt/operators/lincomb.hh b/dune/gdt/operators/lincomb.hh
index 433a156da..772263af3 100644
--- a/dune/gdt/operators/lincomb.hh
+++ b/dune/gdt/operators/lincomb.hh
@@ -357,8 +357,8 @@ public:
LincombOperator(ThisType& other)
: BaseType(other)
{
- for (auto& op : other.ops_)
- this->ops_.emplace_back(op);
+ for (auto& oo : other.ops_)
+ this->ops_.emplace_back(oo);
}
LincombOperator(ThisType&& source)
@@ -368,28 +368,28 @@ public:
using BaseType::add;
- void add(OperatorType& op, const FieldType& coeff = 1.)
+ void add(OperatorType& oo, const FieldType& coeff = 1.)
{
- ops_.emplace_back(op);
+ ops_.emplace_back(oo);
BaseType::add(ops_.back().access(), coeff);
}
- void add(OperatorType*&& op, const FieldType& coeff = 1.)
+ void add(OperatorType*&& oo, const FieldType& coeff = 1.)
{
- BaseType::add(std::move(op), coeff);
+ BaseType::add(std::move(oo), coeff);
ops_.emplace_back(*this->keep_alive_.back());
}
- void add(ThisType& op, const FieldType& coeff = 1.)
+ void add(ThisType& oo, const FieldType& coeff = 1.)
{
- BaseType::add(op, coeff);
- for (size_t ii = 0; ii < op.num_ops(); ++ii)
- ops_.emplace_back(op.ops_[ii]);
+ BaseType::add(oo, coeff);
+ for (size_t ii = 0; ii < oo.num_ops(); ++ii)
+ ops_.emplace_back(oo.ops_[ii]);
}
- void add(ThisType*&& op, const FieldType& coeff = 1.)
+ void add(ThisType*&& oo, const FieldType& coeff = 1.)
{
- this->add(*op, coeff);
+ this->add(*oo, coeff);
}
using BaseType::op;
@@ -404,8 +404,8 @@ public:
OperatorType& assemble(const bool use_tbb = false) override final
{
- for (auto& op : ops_)
- op.access().assemble(use_tbb);
+ for (auto& oo : ops_)
+ oo.access().assemble(use_tbb);
return *this;
}
diff --git a/dune/gdt/tools/local-mass-matrix.hh b/dune/gdt/tools/local-mass-matrix.hh
index 94bb86e9c..cdcd8ea4f 100644
--- a/dune/gdt/tools/local-mass-matrix.hh
+++ b/dune/gdt/tools/local-mass-matrix.hh
@@ -57,7 +57,8 @@ public:
using typename BaseType::ElementType;
LocalMassMatrixProvider(const AssemblyGridView& grid_view, const SpaceType& space)
- : Propagator(this)
+ : BaseType()
+ , Propagator(this)
, grid_view_(grid_view)
, space_(space)
, element_mapper_(grid_view_)
@@ -66,7 +67,8 @@ public:
{}
LocalMassMatrixProvider(const ThisType& other)
- : Propagator(this)
+ : BaseType(other)
+ , Propagator(this)
, grid_view_(other.grid_view_)
, space_(other.space_)
, element_mapper_(grid_view_)
--
GitLab