MXS-2205 Combine routingworker.h with routingworker.hh

2018-12-04 12:26:38 +02:00
parent 9f721f725e
commit bec9455a74
11 changed files with 147 additions and 167 deletions
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@ -38,7 +38,7 @@
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
 #include <maxscale/pcre2.h>
-#include <maxscale/routingworker.h>
+#include <maxscale/routingworker.hh>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.hh>
 #include <maxscale/json_api.h>
--- a/server/core/service.cc
+++ b/server/core/service.cc
@ -54,7 +54,7 @@
 #include <maxscale/utils.hh>
 #include <maxscale/version.h>
 #include <maxscale/json_api.h>
-#include <maxscale/routingworker.h>
+#include <maxscale/routingworker.hh>
 #include <maxscale/routingworker.hh>

 #include "internal/config.hh"
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.cc
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.cc
@ -35,7 +35,7 @@
 #include <maxscale/paths.h>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.h>
-#include <maxscale/routingworker.h>
+#include <maxscale/routingworker.hh>

 static void* mysql_auth_init(char** options);
 static bool  mysql_auth_set_protocol_data(DCB* dcb, GWBUF* buf);
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@ -24,8 +24,7 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/mysql_utils.hh>
-
-#include <maxscale/routingworker.h>
+#include <maxscale/routingworker.hh>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.h>
 // TODO: For monitor_add_parameters
--- a/server/modules/protocol/MySQL/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@ -30,7 +30,7 @@
 #include <maxscale/utils.h>
 #include <maxscale/protocol/mariadb_client.hh>
 #include <maxscale/poll.hh>
-#include <maxscale/routingworker.h>
+#include <maxscale/routingworker.hh>


 uint8_t null_client_sha1[MYSQL_SCRAMBLE_LEN] = "";
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@ -42,7 +42,7 @@
 #include <maxscale/service.hh>
 #include <maxscale/utils.hh>
 #include <maxscale/pcre2.h>
-#include <maxscale/routingworker.h>
+#include <maxscale/routingworker.hh>
 #include <binlog_common.h>

 #include "avro_converter.hh"
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@ -37,7 +37,7 @@
 #include <maxscale/server.hh>
 #include <maxscale/service.hh>
 #include <maxscale/utils.h>
-#include <maxscale/routingworker.h>
+#include <maxscale/routingworker.hh>
 #include <binlog_common.h>

 #include "avro_converter.hh"
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@ -48,7 +48,7 @@
 #include <maxscale/log.h>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/router.hh>
-#include <maxscale/routingworker.h>
+#include <maxscale/routingworker.hh>
 #include <maxbase/worker.hh>
 #include <maxscale/server.hh>
 #include <maxscale/service.hh>
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@ -31,7 +31,7 @@
 #include <maxscale/query_classifier.h>
 #include <maxscale/router.hh>
 #include <maxscale/mysql_utils.hh>
-#include <maxscale/routingworker.h>
+#include <maxscale/routingworker.hh>

 #include "rwsplitsession.hh"