From af70dc39736b34790f64a3bb18d3c54442d34a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Fri, 17 Aug 2018 18:23:04 +0300
Subject: [PATCH] Fix build failures

Fixed build failures caused by merges and rebases.
---
 include/maxscale/worker.hh            | 5 ++---
 server/core/internal/routingworker.hh | 1 +
 server/core/worker.cc                 | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/maxscale/worker.hh b/include/maxscale/worker.hh
index fa01abe73..de5801607 100644
--- a/include/maxscale/worker.hh
+++ b/include/maxscale/worker.hh
@@ -22,7 +22,6 @@
 
 #include <maxbase/semaphore.hh>
 #include <maxscale/platform.h>
-#include <maxscale/semaphore.hh>
 #include <maxscale/session.h>
 #include <maxscale/utils.hh>
 #include <maxscale/worker.h>
@@ -676,7 +675,7 @@ public:
      *
      * @param pSem Semaphore that is posted on once the thread has started
      */
-    void run(mxs::Semaphore* pSem = NULL);
+    void run(mxb::Semaphore* pSem = NULL);
 
     /**
      * Run worker in separate thread.
@@ -1180,7 +1179,7 @@ private:
 
     void handle_message(MessageQueue& queue, const MessageQueue::Message& msg); // override
 
-    static void thread_main(Worker* pThis, mxs::Semaphore* pSem);
+    static void thread_main(Worker* pThis, mxb::Semaphore* pSem);
 
     void poll_waitevents();
 
diff --git a/server/core/internal/routingworker.hh b/server/core/internal/routingworker.hh
index d8368589c..019b949ae 100644
--- a/server/core/internal/routingworker.hh
+++ b/server/core/internal/routingworker.hh
@@ -16,6 +16,7 @@
 
 #include <unordered_map>
 
+#include <maxbase/semaphore.hh>
 #include <maxscale/poll.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/routingworker.h>
diff --git a/server/core/worker.cc b/server/core/worker.cc
index a8f4a0b74..3fb008040 100644
--- a/server/core/worker.cc
+++ b/server/core/worker.cc
@@ -527,7 +527,7 @@ bool Worker::post_message(uint32_t msg_id, intptr_t arg1, intptr_t arg2)
     return m_pQueue->post(message);
 }
 
-void Worker::run(mxs::Semaphore* pSem)
+void Worker::run(mxb::Semaphore* pSem)
 {
     this_thread.pCurrent_worker = this;
 
@@ -559,7 +559,7 @@ bool Worker::start()
 {
     ss_dassert(!m_started);
     ss_dassert(m_thread.get_id() == std::thread::id());
-    mxs::Semaphore sem;
+    mxb::Semaphore sem;
 
     m_started = true;
     m_should_shutdown = false;
@@ -664,7 +664,7 @@ void Worker::handle_message(MessageQueue& queue, const MessageQueue::Message& ms
  * @param arg A worker.
  */
 //static
-void Worker::thread_main(Worker* pThis, mxs::Semaphore* pSem)
+void Worker::thread_main(Worker* pThis, mxb::Semaphore* pSem)
 {
     pThis->run(pSem);
 }