formatter: update clang-format and fix-up file(s)
clang-format-6.0 introduced new changes, also then updates to
.clang-format introduce more new changes.
Change-Id: Iec9f84e3a7a5bf254d66eee46cdc9b3070e06687
Signed-off-by: Patrick Venture <venture@google.com>
diff --git a/utils.hpp b/utils.hpp
index cf3b5cf..aacee5e 100644
--- a/utils.hpp
+++ b/utils.hpp
@@ -11,7 +11,8 @@
*
* @tparam V - The desired variant type.
*/
-template <typename V> struct MakeVariantVisitor
+template <typename V>
+struct MakeVariantVisitor
{
/** @struct Make
* @brief Return variant visitor.
@@ -20,7 +21,8 @@
* @tparam Arg - The type being visited in the source variant.
* @tparam Enable - Overload resolution removal.
*/
- template <typename T, typename Arg, typename Enable = void> struct Make
+ template <typename T, typename Arg, typename Enable = void>
+ struct Make
{
static auto make(Arg&& arg)
{
@@ -47,7 +49,8 @@
};
/** @brief Make variant visitor. */
- template <typename Arg> auto operator()(Arg&& arg) const
+ template <typename Arg>
+ auto operator()(Arg&& arg) const
{
return Make<V, Arg>::make(arg);
}
@@ -61,7 +64,8 @@
* @param[in] v - The source variant.
* @returns - The converted variant.
*/
-template <typename V, typename Arg> auto convertVariant(Arg&& v)
+template <typename V, typename Arg>
+auto convertVariant(Arg&& v)
{
return sdbusplus::message::variant_ns::apply_visitor(
MakeVariantVisitor<V>(), v);
@@ -75,7 +79,8 @@
*
* @tparam Compare - The function object type being adapted.
*/
-template <typename Compare> struct CompareFirst
+template <typename Compare>
+struct CompareFirst
{
/** @brief Construct a CompareFirst adapter.
*
@@ -143,7 +148,8 @@
};
/* @brief Implicit template instantation wrapper for CompareFirst. */
-template <typename Compare> CompareFirst<Compare> compareFirst(Compare&& c)
+template <typename Compare>
+CompareFirst<Compare> compareFirst(Compare&& c)
{
return CompareFirst<Compare>(std::forward<Compare>(c));
}