commit 2c4fbc4cd879ee88bf668e7236775fe6fbc0bffb
author Patrick Williams <patrick@stwcx.xyz> Fri Jun 26 15:33:11 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Fri Jun 26 15:50:40 2020 -0500
tree cbd510a7a17fc4a96461d5bffde7af1e877d0acb
parent d7778fb0c8bdb52429a4b6c41cab5a053a1c0a89

clang-format: update to latest version

Pick up latest .clang-format file from the docs repository.
Fix formatting on all files.
Minor compile fixes due to GCC10 and sdbusplus changes.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ie1f7a4e59b6cf015310effef50d558ff59731024

power-supply/power_supply.cpp

diff --git a/power-supply/power_supply.cpp b/power-supply/power_supply.cpp
index d2d3e9c..d936d28 100644
--- a/power-supply/power_supply.cpp
+++ b/power-supply/power_supply.cpp
@@ -21,13 +21,14 @@
 #include "pmbus.hpp"
 #include "utility.hpp"
 
-#include <functional>
 #include <org/open_power/Witherspoon/Fault/error.hpp>
 #include <phosphor-logging/elog.hpp>
 #include <phosphor-logging/log.hpp>
 #include <xyz/openbmc_project/Common/Device/error.hpp>
 #include <xyz/openbmc_project/Software/Version/server.hpp>
 
+#include <functional>
+
 namespace witherspoon
 {
 namespace power
@@ -664,36 +665,32 @@
             sn = pmbusIntf.readString(SERIAL_NUMBER, Type::HwmonDeviceDebug);
         }
         catch (ReadFailure& e)
-        {
-        }
+        {}
 
         try
         {
             pn = pmbusIntf.readString(PART_NUMBER, Type::HwmonDeviceDebug);
         }
         catch (ReadFailure& e)
-        {
-        }
+        {}
 
         try
         {
             ccin = pmbusIntf.readString(CCIN, Type::HwmonDeviceDebug);
         }
         catch (ReadFailure& e)
-        {
-        }
+        {}
 
         try
         {
             version = pmbusIntf.readString(FW_VERSION, Type::HwmonDeviceDebug);
         }
         catch (ReadFailure& e)
-        {
-        }
+        {}
     }
 
     // Build the object map and send it to the inventory
-    using Properties = std::map<std::string, variant<std::string>>;
+    using Properties = std::map<std::string, std::variant<std::string>>;
     using Interfaces = std::map<std::string, Properties>;
     using Object = std::map<object_path, Interfaces>;
     Properties assetProps;