MXS-2004 Remove additional dependencies on maxscale/thread.h

2018-08-10 15:42:30 +03:00
parent 5d6b05af1f
commit f9ba8824d4
8 changed files with 5 additions and 12 deletions
--- a/server/modules/monitor/mariadbmon/cluster_manipulation.cc
+++ b/server/modules/monitor/mariadbmon/cluster_manipulation.cc
@ -836,7 +836,7 @@ bool MariaDBMonitor::wait_cluster_stabilization(MariaDBServer* new_master, const
        {
            if (!first_round)
            {
-                thread_millisleep(500);
+                std::this_thread::sleep_for(std::chrono::milliseconds(500));
            }

            // Erasing elements from an array, so iterate from last to first
--- a/server/modules/monitor/mariadbmon/mariadbmon.hh
+++ b/server/modules/monitor/mariadbmon/mariadbmon.hh
@ -20,7 +20,6 @@
 #include <vector>

 #include <maxscale/monitor.hh>
-#include <maxscale/thread.h>

 #include "mariadbserver.hh"

--- a/server/modules/monitor/mmmon/mmmon.hh
+++ b/server/modules/monitor/mmmon/mmmon.hh
@ -14,7 +14,6 @@

 #include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.hh>
-#include <maxscale/thread.h>

 /**
 * @file mmmon.hh - The Multi-Master monitor
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.hh
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.hh
@ -14,7 +14,6 @@

 #include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.hh>
-#include <maxscale/thread.h>

 /**
 * @file ndbcclustermon.hh A NDBC cluster monitor