From f748cbd19e4d23cb673f9265da507be73ba91f88 Mon Sep 17 00:00:00 2001
From: Manuel Weberndorfer <manuel.weberndorfer@id.ethz.ch>
Date: Tue, 8 Feb 2022 14:25:28 +0000
Subject: [PATCH] format code with clang-format 13.0
---
.../src/include/ae108/assembly/Assembler.h | 10 ++++-----
.../include/ae108/assembly/AssemblerGroup.h | 4 ++--
.../include/ae108/assembly/FeaturePlugin.h | 18 ++++++++--------
.../ae108/assembly/utilities/StaticLooper.h | 6 +++---
.../src/include/ae108/cpppetsc/TaggedEntity.h | 21 ++++++++++---------
.../ae108/elements/quadrature/Quadrature.h | 2 +-
.../ae108/elements/quadrature/integrate.h | 2 +-
7 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/assembly/src/include/ae108/assembly/Assembler.h b/assembly/src/include/ae108/assembly/Assembler.h
index 4dad58d5..cbdbdc49 100644
--- a/assembly/src/include/ae108/assembly/Assembler.h
+++ b/assembly/src/include/ae108/assembly/Assembler.h
@@ -66,7 +66,7 @@ public:
/**
* @param args Are used to construct the plugins.
*/
- template <class... Args> explicit Assembler(Args &&... args);
+ template <class... Args> explicit Assembler(Args &&...args);
using ElementView = typename cpppetsc::LocalElementView<mesh_type>;
@@ -82,7 +82,7 @@ public:
* constructor.
*/
template <class... Args>
- void emplaceElement(ElementView view, Args &&... constructorArguments);
+ void emplaceElement(ElementView view, Args &&...constructorArguments);
/**
* @brief Returns a range of iterators pointing to a struct with two methods:
@@ -191,13 +191,13 @@ namespace assembly {
template <class Element, class Plugins, class Policy>
template <class... Args>
-Assembler<Element, Plugins, Policy>::Assembler(Args &&... args)
+Assembler<Element, Plugins, Policy>::Assembler(Args &&...args)
: PluginBase(std::forward<Args>(args)...) {}
template <class Element, class Plugins, class Policy>
template <class... Args>
void Assembler<Element, Plugins, Policy>::emplaceElement(
- ElementView view, Args &&... constructorArguments) {
+ ElementView view, Args &&...constructorArguments) {
_elements.emplace_back(std::move(view),
std::forward<Args>(constructorArguments)...);
}
@@ -220,7 +220,7 @@ public:
* @param args Are used to construct in-place the element instance.
*/
template <class... Args>
- explicit AnnotatedElement(ElementView view, Args &&... args)
+ explicit AnnotatedElement(ElementView view, Args &&...args)
: _meshView(std::move(view)), _instance(std::forward<Args>(args)...) {}
const ElementView &meshView() const { return _meshView; }
diff --git a/assembly/src/include/ae108/assembly/AssemblerGroup.h b/assembly/src/include/ae108/assembly/AssemblerGroup.h
index 2d26f7a0..db853061 100644
--- a/assembly/src/include/ae108/assembly/AssemblerGroup.h
+++ b/assembly/src/include/ae108/assembly/AssemblerGroup.h
@@ -42,7 +42,7 @@ class AssemblerGroup : public DerivePluginsUniquely<
typename MemberTypeTrait<AssemblerGroup, N>::type;
public:
- template <class... Args> explicit AssemblerGroup(Args &&... args);
+ template <class... Args> explicit AssemblerGroup(Args &&...args);
/**
* @brief Get the Nth member assembler.
@@ -169,7 +169,7 @@ namespace assembly {
template <class... SingleElementAssemblers>
template <class... Args>
-AssemblerGroup<SingleElementAssemblers...>::AssemblerGroup(Args &&... args)
+AssemblerGroup<SingleElementAssemblers...>::AssemblerGroup(Args &&...args)
: _assemblers(std::forward<Args>(args)...) {}
template <class... SingleElementAssemblers>
diff --git a/assembly/src/include/ae108/assembly/FeaturePlugin.h b/assembly/src/include/ae108/assembly/FeaturePlugin.h
index 8da953ec..6c0687eb 100644
--- a/assembly/src/include/ae108/assembly/FeaturePlugin.h
+++ b/assembly/src/include/ae108/assembly/FeaturePlugin.h
@@ -19,7 +19,7 @@
#include <utility>
#define DEFINE_ASSEMBLER_METHOD_BASE(methodName, cvQualifiers) \
- template <class... Args> void methodName(Args &&... args) cvQualifiers { \
+ template <class... Args> void methodName(Args &&...args) cvQualifiers { \
this->dispatch(std::forward<Args>(args)...); \
}
@@ -79,13 +79,13 @@ protected:
* @brief Calls execute with the given parameters for all (member) assemblers
* that have the plugin (const version).
*/
- template <class... Args> void dispatch(Args &&... args) const;
+ template <class... Args> void dispatch(Args &&...args) const;
/**
* @brief Calls execute with the given parameters for all (member) assemblers
* that have the plugin (nonconst version).
*/
- template <class... Args> void dispatch(Args &&... args);
+ template <class... Args> void dispatch(Args &&...args);
~FeaturePlugin() = default;
};
@@ -117,7 +117,7 @@ using CastType =
template <template <class> class Plugin> struct Executor {
template <class Assembler, class... Args>
- void operator()(Assembler &assembler, Args &&... args) const {
+ void operator()(Assembler &assembler, Args &&...args) const {
operatorImpl(
HasPlugin<typename std::remove_const<Assembler>::type, Plugin>{},
assembler, std::forward<Args>(args)...);
@@ -126,7 +126,7 @@ template <template <class> class Plugin> struct Executor {
private:
template <class Assembler, class... Args>
void operatorImpl(std::true_type, Assembler &assembler,
- Args &&... args) const {
+ Args &&...args) const {
static_cast<CastType<Assembler, Plugin>>(assembler).execute(
std::forward<Args>(args)...);
}
@@ -139,7 +139,7 @@ private:
* @brief Implementation of dispatch for the assembler-group case.
*/
template <template <class> class Plugin, class Assembler, class... Args>
-void dispatchImpl(std::true_type, Assembler &assembler, Args &&... args) {
+void dispatchImpl(std::true_type, Assembler &assembler, Args &&...args) {
utilities::StaticLooper<NumberOfMembersTypeTrait<typename std::remove_const<
Assembler>::type>::value>::run(detail::Executor<Plugin>{}, assembler,
std::forward<Args>(args)...);
@@ -149,7 +149,7 @@ void dispatchImpl(std::true_type, Assembler &assembler, Args &&... args) {
* @brief Implementation of dispatch for the non-assembler-group case.
*/
template <template <class> class Plugin, class Assembler, class... Args>
-void dispatchImpl(std::false_type, Assembler &assembler, Args &&... args) {
+void dispatchImpl(std::false_type, Assembler &assembler, Args &&...args) {
static_cast<CastType<Assembler, Plugin>>(assembler).execute(
std::forward<Args>(args)...);
}
@@ -168,14 +168,14 @@ const Assembler &FeaturePlugin<Assembler, Plugin>::assembler() const {
template <class Assembler, template <class> class Plugin>
template <class... Args>
-void FeaturePlugin<Assembler, Plugin>::dispatch(Args &&... args) const {
+void FeaturePlugin<Assembler, Plugin>::dispatch(Args &&...args) const {
detail::dispatchImpl<Plugin>(IsGroupTypeTrait<Assembler>{}, assembler(),
std::forward<Args>(args)...);
}
template <class Assembler, template <class> class Plugin>
template <class... Args>
-void FeaturePlugin<Assembler, Plugin>::dispatch(Args &&... args) {
+void FeaturePlugin<Assembler, Plugin>::dispatch(Args &&...args) {
detail::dispatchImpl<Plugin>(IsGroupTypeTrait<Assembler>{}, assembler(),
std::forward<Args>(args)...);
}
diff --git a/assembly/src/include/ae108/assembly/utilities/StaticLooper.h b/assembly/src/include/ae108/assembly/utilities/StaticLooper.h
index 4be1eadc..b8a9952c 100644
--- a/assembly/src/include/ae108/assembly/utilities/StaticLooper.h
+++ b/assembly/src/include/ae108/assembly/utilities/StaticLooper.h
@@ -28,7 +28,7 @@ namespace utilities {
*/
template <std::size_t To, std::size_t From = 0u> struct StaticLooper {
template <class Functor, class Value, class... Args>
- static void run(Functor &&functor, Value &&value, Args &&... args);
+ static void run(Functor &&functor, Value &&value, Args &&...args);
};
/**
@@ -36,7 +36,7 @@ template <std::size_t To, std::size_t From = 0u> struct StaticLooper {
*/
template <std::size_t To> struct StaticLooper<To, To> {
template <class Functor, class Value, class... Args>
- static void run(Functor &&, Value &&, Args &&... args);
+ static void run(Functor &&, Value &&, Args &&...args);
};
} // namespace utilities
} // namespace assembly
@@ -53,7 +53,7 @@ namespace utilities {
template <std::size_t To, std::size_t From>
template <class Functor, class Value, class... Args>
void StaticLooper<To, From>::run(Functor &&functor, Value &&value,
- Args &&... args) {
+ Args &&...args) {
functor(value.template get<From>(), args...);
StaticLooper<To, From + 1>::run(std::forward<Functor>(functor),
std::forward<Value>(value),
diff --git a/cpppetsc/src/include/ae108/cpppetsc/TaggedEntity.h b/cpppetsc/src/include/ae108/cpppetsc/TaggedEntity.h
index 0c7c5113..2a365cf1 100644
--- a/cpppetsc/src/include/ae108/cpppetsc/TaggedEntity.h
+++ b/cpppetsc/src/include/ae108/cpppetsc/TaggedEntity.h
@@ -33,21 +33,22 @@ public:
/**
* @brief Constructs the contained value with the given arguments.
*/
- template <class... Args> explicit constexpr TaggedEntity(Args &&... args);
+ template <class... Args> explicit constexpr TaggedEntity(Args &&...args);
/**
* @brief Calls operator() of the contained value.
*/
template <class... Args>
- auto operator()(Args &&... args)
+ auto operator()(Args &&...args)
-> decltype(std::declval<value_type>()(std::forward<Args>(args)...));
/**
* @brief Calls operator() of the contained value.
*/
template <class... Args>
- constexpr auto operator()(Args &&... args) const -> decltype(
- std::declval<const value_type>()(std::forward<Args>(args)...));
+ constexpr auto operator()(Args &&...args) const
+ -> decltype(std::declval<const value_type>()(
+ std::forward<Args>(args)...));
/**
* @brief Returns a const reference to the contained value.
@@ -100,12 +101,12 @@ namespace cpppetsc {
template <class Entity, class Tag>
template <class... Args>
-constexpr TaggedEntity<Entity, Tag>::TaggedEntity(Args &&... args)
+constexpr TaggedEntity<Entity, Tag>::TaggedEntity(Args &&...args)
: _value(std::forward<Args>(args)...) {}
template <class Entity, class Tag>
template <class... Args>
-auto TaggedEntity<Entity, Tag>::operator()(Args &&... args)
+auto TaggedEntity<Entity, Tag>::operator()(Args &&...args)
-> decltype(std::declval<typename TaggedEntity<Entity, Tag>::value_type>()(
std::forward<Args>(args)...)) {
return _value(std::forward<Args>(args)...);
@@ -113,10 +114,10 @@ auto TaggedEntity<Entity, Tag>::operator()(Args &&... args)
template <class Entity, class Tag>
template <class... Args>
-constexpr auto TaggedEntity<Entity, Tag>::operator()(Args &&... args) const
- -> decltype(
- std::declval<const typename TaggedEntity<Entity, Tag>::value_type>()(
- std::forward<Args>(args)...)) {
+constexpr auto TaggedEntity<Entity, Tag>::operator()(Args &&...args) const
+ -> decltype(std::declval<
+ const typename TaggedEntity<Entity, Tag>::value_type>()(
+ std::forward<Args>(args)...)) {
return _value(std::forward<Args>(args)...);
}
diff --git a/elements/src/include/ae108/elements/quadrature/Quadrature.h b/elements/src/include/ae108/elements/quadrature/Quadrature.h
index cf2a746c..44da968f 100644
--- a/elements/src/include/ae108/elements/quadrature/Quadrature.h
+++ b/elements/src/include/ae108/elements/quadrature/Quadrature.h
@@ -679,7 +679,7 @@ struct IntegrateTrait<Quadrature<Type_, Dimension_, Order_>> {
template <class Quadrature, class R, class F, class... Args>
typename std::decay<R>::type
operator()(F &&f, R &&init,
- const typename Quadrature::template Collection<Args> &... args)
+ const typename Quadrature::template Collection<Args> &...args)
const noexcept {
return eval(std::forward<F>(f), std::forward<R>(init),
typename Quadrature::size_type{0},
diff --git a/elements/src/include/ae108/elements/quadrature/integrate.h b/elements/src/include/ae108/elements/quadrature/integrate.h
index 7068a32f..19ee25bf 100644
--- a/elements/src/include/ae108/elements/quadrature/integrate.h
+++ b/elements/src/include/ae108/elements/quadrature/integrate.h
@@ -30,7 +30,7 @@ namespace quadrature {
template <class Quadrature, class R, class F, class... Args>
constexpr typename std::decay<R>::type
integrate(F &&f, R &&init,
- const typename Quadrature::template Collection<Args> &... args) {
+ const typename Quadrature::template Collection<Args> &...args) {
return IntegrateTrait<Quadrature>().template operator()<Quadrature>(
std::forward<F>(f), std::forward<R>(init), args...);
}
--
GitLab