From ac8039592ad4b58edbf79900bf41a1faabea3fa2 Mon Sep 17 00:00:00 2001
From: Patrick Venture <venture@google.com>
Date: Fri, 31 Aug 2018 09:28:31 -0700
Subject: clang-format-6.0 bump fixes

The bump to use clang-format-6.0 now reports these issues.

Change-Id: I174c882727eaa9adf472599443a2f8ef637e2f0a
Signed-off-by: Patrick Venture <venture@google.com>
---
 src/event_serialize.cpp        | 2 +-
 src/sdevent/event.hpp          | 2 +-
 src/test/propertywatchtest.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/event_serialize.cpp b/src/event_serialize.cpp
index c7e78d9..ddfc4b6 100644
--- a/src/event_serialize.cpp
+++ b/src/event_serialize.cpp
@@ -93,5 +93,5 @@ bool deserialize(const fs::path& path, Entry& event)
     }
 }
 
-} // namespace event
+} // namespace events
 } // namespace phosphor
diff --git a/src/sdevent/event.hpp b/src/sdevent/event.hpp
index f47c05d..e3d1b22 100644
--- a/src/sdevent/event.hpp
+++ b/src/sdevent/event.hpp
@@ -15,7 +15,7 @@ namespace timer
 {
 class Timer;
 } // namespace timer
-}
+} // namespace event
 namespace event
 {
 
diff --git a/src/test/propertywatchtest.cpp b/src/test/propertywatchtest.cpp
index 6576bfd..bb021a2 100644
--- a/src/test/propertywatchtest.cpp
+++ b/src/test/propertywatchtest.cpp
@@ -107,8 +107,8 @@ template <> struct ExpectedValues<std::string>
 
 template <typename T> void testStart()
 {
-    using ::testing::Return;
     using ::testing::_;
+    using ::testing::Return;
 
     MockDBusInterface dbus;
     MockDBusInterface::instance(dbus);
-- 
cgit v1.2.1