Deinline

2 files changed, 12 insertions, 10 deletions

diff --git a/logd/src/tests/watcher/watcher_test.cpp b/logd/src/tests/watcher/watcher_test.cpp
index 55ba720c0cb..fa8c2ffe932 100644
--- a/logd/src/tests/watcher/watcher_test.cpp
+++ b/logd/src/tests/watcher/watcher_test.cpp
@@ -61,14 +61,8 @@ struct DummyForwarder : public Forwarder {
     std::mutex lock;
     std::condition_variable cond;
     std::vector<std::string> lines;
-    DummyForwarder()
-        : Forwarder(),
-          lock(),
-          cond(),
-          lines()
-    {
-    }
-    ~DummyForwarder() override = default;
+    DummyForwarder();
+    ~DummyForwarder() override;
     void forwardLine(std::string_view log_line) override {
         std::lock_guard guard(lock);
         lines.emplace_back(log_line);
@@ -87,6 +81,14 @@ struct DummyForwarder : public Forwarder {
     }
 };
 
+DummyForwarder::DummyForwarder()
+    : Forwarder(),
+      lock(),
+      cond(),
+      lines()
+{ }
+DummyForwarder::~DummyForwarder() = default;
+
 struct WatcherFixture
 {
     DummyForwarder fwd;
diff --git a/messagebus/src/tests/messagebus/messagebus.cpp b/messagebus/src/tests/messagebus/messagebus.cpp
index 1abf5ae8ab2..7f5c852a6cb 100644
--- a/messagebus/src/tests/messagebus/messagebus.cpp
+++ b/messagebus/src/tests/messagebus/messagebus.cpp
@@ -30,11 +30,11 @@ struct Base {
         return RoutingSpec()
             .addTable(RoutingTableSpec("Simple")
                       .addHop(HopSpec("DocProc", "docproc/*/session"))
-                      .addHop(HopSpec("Search", "search/[All]/[Hash]/session")
+                      .addHop(std::move(HopSpec("Search", "search/[All]/[Hash]/session")
                               .addRecipient("search/r.0/c.0/session")
                               .addRecipient("search/r.0/c.1/session")
                               .addRecipient("search/r.1/c.0/session")
-                              .addRecipient("search/r.1/c.1/session"))
+                              .addRecipient("search/r.1/c.1/session")))
                       .addRoute(RouteSpec("Index").addHop("DocProc").addHop("Search"))
                       .addRoute(RouteSpec("DocProc").addHop("DocProc"))
                       .addRoute(RouteSpec("Search").addHop("Search")));