commit ab4cc6a5585436a29b120429abaa48b416f8edb7
author Gunnar Mills <gmills@us.ibm.com> Fri Sep 14 14:42:39 2018 -0500
committer Lei YU <mine260309@gmail.com> Mon Oct 08 06:07:30 2018 +0000
tree e1e153150cb1aff1656359f4d03c4536d47e1fe0
parent 19b37ee2205ff4e772d344fe8a5fcfee2aa0d8ec

clang-format: Update to match docs repo

Update the .clang-format file and run clang-format-6.0.
This .clang-format matches the example one in
https://github.com/openbmc/docs/blob/master/cpp-style-and-conventions.md#clang-formatting

Change-Id: Ic2c462525eb27b8295c2b298871e04268d93faf2
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>

host_epoch.cpp

diff --git a/host_epoch.cpp b/host_epoch.cpp
index c3e6400..96cbfa9 100644
--- a/host_epoch.cpp
+++ b/host_epoch.cpp
@@ -1,4 +1,5 @@
 #include "host_epoch.hpp"
+
 #include "utils.hpp"
 
 #include <phosphor-logging/elog-errors.hpp>
@@ -16,14 +17,13 @@
 using NotAllowedError =
     sdbusplus::xyz::openbmc_project::Time::Error::NotAllowed;
 
-HostEpoch::HostEpoch(sdbusplus::bus::bus& bus,
-                     const char* objPath)
-    : EpochBase(bus, objPath),
-      offset(utils::readData<decltype(offset)::rep>(offsetFile))
+HostEpoch::HostEpoch(sdbusplus::bus::bus& bus, const char* objPath) :
+    EpochBase(bus, objPath),
+    offset(utils::readData<decltype(offset)::rep>(offsetFile))
 {
     // Initialize the diffToSteadyClock
-    auto steadyTime = duration_cast<microseconds>(
-        steady_clock::now().time_since_epoch());
+    auto steadyTime =
+        duration_cast<microseconds>(steady_clock::now().time_since_epoch());
     diffToSteadyClock = getTime() + offset - steadyTime;
 }
 
@@ -52,8 +52,8 @@
         MANUAL| BOTH  | OK, and set time to BMC
     */
     if (timeOwner == Owner::BMC ||
-        (timeMode == Mode::NTP
-         && (timeOwner == Owner::Host || timeOwner == Owner::Both)))
+        (timeMode == Mode::NTP &&
+         (timeOwner == Owner::Host || timeOwner == Owner::Both)))
     {
         using namespace xyz::openbmc_project::Time;
         elog<NotAllowedError>(
@@ -70,8 +70,8 @@
         saveOffset();
 
         // Calculate the diff between host and steady time
-        auto steadyTime = duration_cast<microseconds>(
-            steady_clock::now().time_since_epoch());
+        auto steadyTime =
+            duration_cast<microseconds>(steady_clock::now().time_since_epoch());
         diffToSteadyClock = time - steadyTime;
     }
     else
@@ -98,8 +98,8 @@
     {
         // In SPLIT, need to re-calculate the diff between
         // host and steady time
-        auto steadyTime = duration_cast<microseconds>(
-            steady_clock::now().time_since_epoch());
+        auto steadyTime =
+            duration_cast<microseconds>(steady_clock::now().time_since_epoch());
         diffToSteadyClock = getTime() - steadyTime;
     }
 }
@@ -116,8 +116,8 @@
     // the offset shall be adjusted
     if (timeOwner == Owner::Split)
     {
-        auto steadyTime = duration_cast<microseconds>(
-            steady_clock::now().time_since_epoch());
+        auto steadyTime =
+            duration_cast<microseconds>(steady_clock::now().time_since_epoch());
         auto hostTime = steadyTime + diffToSteadyClock;
         offset = hostTime - bmcTime;
 
@@ -127,4 +127,3 @@
 
 } // namespace time
 } // namespace phosphor
-