hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build failures

Browse Source 
Fixed build failures caused by merges and rebases.
This commit is contained in:
Markus Mäkelä
2018-08-17 18:23:04 +03:00
parent 667e9df97c
commit af70dc3973
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/maxscale/worker.hh
View File

@ -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();