summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Venture <venture@google.com>2018-08-31 09:28:31 -0700
committerPatrick Venture <venture@google.com>2018-08-31 09:31:06 -0700
commitac8039592ad4b58edbf79900bf41a1faabea3fa2 (patch)
treec838b8c953ffcaa9c6ae3c6bb58b77035cdc9701
parente88df9cfcb1ab27413c0591202b5deb918c85c60 (diff)
downloadphosphor-dbus-monitor-ac8039592ad4b58edbf79900bf41a1faabea3fa2.zip
phosphor-dbus-monitor-ac8039592ad4b58edbf79900bf41a1faabea3fa2.tar.gz
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>
-rw-r--r--src/event_serialize.cpp2
-rw-r--r--src/sdevent/event.hpp2
-rw-r--r--src/test/propertywatchtest.cpp2
3 files changed, 3 insertions, 3 deletions
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);
OpenPOWER on IntegriCloud