From 07caef40502a4f5efcaa4fb535da943076a25f3e Mon Sep 17 00:00:00 2001
From: Tobias Leibner <tobias.leibner@googlemail.com>
Date: Wed, 27 Mar 2019 09:09:47 +0100
Subject: [PATCH] [interfaces/base] address comments
---
.../base/combined-element-functions.hh | 32 +++++++++----------
dune/xt/functions/interfaces/flux-function.hh | 5 ---
dune/xt/functions/inverse.hh | 2 +-
3 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/dune/xt/functions/base/combined-element-functions.hh b/dune/xt/functions/base/combined-element-functions.hh
index 73e46b73c..21c6f03f0 100644
--- a/dune/xt/functions/base/combined-element-functions.hh
+++ b/dune/xt/functions/base/combined-element-functions.hh
@@ -336,22 +336,22 @@ public:
template <class LeftType, class RightType>
struct DualStorageProvider
{
- XT::Common::StorageProvider<LeftType> left_;
- XT::Common::StorageProvider<RightType> right_;
+ XT::Common::StorageProvider<LeftType> left;
+ XT::Common::StorageProvider<RightType> right;
- DualStorageProvider(LeftType& left, RightType& right)
- : left_(left)
- , right_(right)
+ DualStorageProvider(LeftType& lft, RightType& rght)
+ : left(lft)
+ , right(rght)
{}
- DualStorageProvider(std::shared_ptr<LeftType> left, std::shared_ptr<RightType> right)
- : left_(left)
- , right_(right)
+ DualStorageProvider(std::shared_ptr<LeftType> lft, std::shared_ptr<RightType> rght)
+ : left(lft)
+ , right(rght)
{}
- DualStorageProvider(std::unique_ptr<LeftType>&& left, std::unique_ptr<RightType>&& right)
- : left_(std::move(left))
- , right_(std::move(right))
+ DualStorageProvider(std::unique_ptr<LeftType>&& lft, std::unique_ptr<RightType>&& rght)
+ : left(std::move(lft))
+ , right(std::move(rght))
{}
}; // struct DualStorageProvider
@@ -478,24 +478,24 @@ public:
CombinedElementFunction(LeftType& left, RightType& right)
: Storage(left, right)
- , BaseType(Storage::left_.access(), Storage::right_.access())
+ , BaseType(Storage::left.access(), Storage::right.access())
{}
CombinedElementFunction(std::shared_ptr<LeftType> left, std::shared_ptr<RightType> right)
: Storage(left, right)
- , BaseType(Storage::left_.access(), Storage::right_.access())
+ , BaseType(Storage::left.access(), Storage::right.access())
{}
CombinedElementFunction(std::unique_ptr<LeftType>&& left, std::unique_ptr<RightType>&& right)
: Storage(std::move(left), std::move(right))
- , BaseType(Storage::left_.access(), Storage::right_.access())
+ , BaseType(Storage::left.access(), Storage::right.access())
{}
protected:
void post_bind(const ElementType& element) override final
{
- Storage::left_.access().bind(element);
- Storage::right_.access().bind(element);
+ Storage::left.access().bind(element);
+ Storage::right.access().bind(element);
}
}; // class CombinedElementFunction
diff --git a/dune/xt/functions/interfaces/flux-function.hh b/dune/xt/functions/interfaces/flux-function.hh
index 68b98b514..275a55cc0 100644
--- a/dune/xt/functions/interfaces/flux-function.hh
+++ b/dune/xt/functions/interfaces/flux-function.hh
@@ -83,11 +83,6 @@ public:
virtual ~FluxFunctionInterface() = default;
- static std::string static_id()
- {
- return "dune.xt.functions.gridfunction";
- }
-
virtual bool x_dependent() const
{
return true;
diff --git a/dune/xt/functions/inverse.hh b/dune/xt/functions/inverse.hh
index b22f30992..c3efe4b23 100644
--- a/dune/xt/functions/inverse.hh
+++ b/dune/xt/functions/inverse.hh
@@ -133,7 +133,7 @@ protected:
}
public:
- int order(const XT::Common::Parameter& param = {}) const override final
+ int order(const XT::Common::Parameter& /*param*/ = {}) const override final
{
return order_;
}
--
GitLab