Enable clang-format
Fix up problems and enable clang-format during CI builds.
Change-Id: Ia5c88281f7090c0aa09ba586d968f1fcd8aba4f1
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/utils.hpp b/utils.hpp
index 2db1d37..cf3b5cf 100644
--- a/utils.hpp
+++ b/utils.hpp
@@ -11,8 +11,7 @@
*
* @tparam V - The desired variant type.
*/
-template <typename V>
-struct MakeVariantVisitor
+template <typename V> struct MakeVariantVisitor
{
/** @struct Make
* @brief Return variant visitor.
@@ -21,8 +20,7 @@
* @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)
{
@@ -38,8 +36,9 @@
* struct Make specialization if Arg is in T (int -> variant<int, char>).
*/
template <typename T, typename Arg>
- struct Make<T, Arg,
- typename std::enable_if<std::is_convertible<Arg, T>::value>::type>
+ struct Make<
+ T, Arg,
+ typename std::enable_if<std::is_convertible<Arg, T>::value>::type>
{
static auto make(Arg&& arg)
{
@@ -48,8 +47,7 @@
};
/** @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);
}
@@ -63,11 +61,10 @@
* @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);
+ MakeVariantVisitor<V>(), v);
}
/** @struct CompareFirst
@@ -78,14 +75,15 @@
*
* @tparam Compare - The function object type being adapted.
*/
-template <typename Compare>
-struct CompareFirst
+template <typename Compare> struct CompareFirst
{
/** @brief Construct a CompareFirst adapter.
*
* @param[in] c - The function object being adapted.
*/
- explicit CompareFirst(Compare&& c) : compare(std::forward<Compare>(c)) {}
+ explicit CompareFirst(Compare&& c) : compare(std::forward<Compare>(c))
+ {
+ }
/** @brief Compare two pairs adapter.
*
@@ -100,7 +98,8 @@
* @returns - The result of the comparison.
*/
template <typename L1, typename L2, typename R1, typename R2>
- bool operator()(const std::pair<L1, L2>& l, const std::pair<R1, R2>& r) const
+ bool operator()(const std::pair<L1, L2>& l,
+ const std::pair<R1, R2>& r) const
{
return compare(l.first, r.first);
}
@@ -144,8 +143,7 @@
};
/* @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));
}
@@ -159,7 +157,9 @@
*
* @param[in] p - The prefix to check for and remove.
*/
- explicit RelPathCompare(const char* p) : prefix(p) {}
+ explicit RelPathCompare(const char* p) : prefix(p)
+ {
+ }
/** @brief Check for the prefix and remove if found.
*