style: update clang-format

Pull the most recent OpenBMC style rules and run clang-format.

Change-Id: I11a25ea1e62d6c739010d9dd742a139fb17cc09a
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/functor.hpp b/functor.hpp
index 67dc4de..e220550 100644
--- a/functor.hpp
+++ b/functor.hpp
@@ -3,8 +3,9 @@
 #include "types.hpp"
 #include "utils.hpp"
 
-#include <memory>
 #include <sdbusplus/bus.hpp>
+
+#include <memory>
 #include <utility>
 
 namespace phosphor
@@ -200,8 +201,7 @@
                              U&& condition) :
         _iface(iface),
         _property(property), _condition(std::forward<U>(condition))
-    {
-    }
+    {}
 
     /** @brief Test a property value.
      *
@@ -269,8 +269,7 @@
                           const char* property, const char* service) :
         _path(path ? path : std::string()),
         _iface(iface), _property(property), _service(service)
-    {
-    }
+    {}
 
     /** @brief Forward comparison to type specific implementation. */
     virtual bool eval(sdbusplus::message::message&) const = 0;
@@ -342,8 +341,7 @@
         PropertyConditionBase(path, iface, property, service),
         _condition(std::forward<decltype(condition)>(condition)),
         _getProperty(getProperty)
-    {
-    }
+    {}
 
     /** @brief Test a property value.
      *