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

MXS-1840 Compile all routers as C++

Browse Source 
Minimal changes, only what is needed in order to make it compile.
This commit is contained in:
Johan Wikman
2018-05-03 15:53:17 +03:00
parent 10b2b4ac37
commit 1f6cc6db8a
39 changed files with 476 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/readconnroute/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_library(readconnroute SHARED readconnroute.c)
add_library(readconnroute SHARED readconnroute.cc)
target_link_libraries(readconnroute maxscale-common)
set_target_properties(readconnroute PROPERTIES VERSION "1.1.0")
install_module(readconnroute core)

9
server/modules/routing/readconnroute/readconnroute.c → server/modules/routing/readconnroute/readconnroute.cc
View File

@ -112,7 +112,7 @@ static SERVER_REF *get_root_master(SERVER_REF *servers);
*
* @return The module object
*/
MXS_MODULE* MXS_CREATE_MODULE()
extern "C" MXS_MODULE* MXS_CREATE_MODULE()
{
MXS_NOTICE("Initialise readconnroute router module.");
@ -176,7 +176,7 @@ createInstance(SERVICE *service, char **options)
SERVER_REF *sref;
int i, n;
if ((inst = MXS_CALLOC(1, sizeof(ROUTER_INSTANCE))) == NULL)
if ((inst = static_cast<ROUTER_INSTANCE*>(MXS_CALLOC(1, sizeof(ROUTER_INSTANCE)))) == NULL)
{
return NULL;
}
@ -433,7 +433,7 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session)
MXS_INFO("New session for server %s. Connections : %d",
candidate->server->name, candidate->connections);
return (void *) client_rses;
return reinterpret_cast<MXS_ROUTER_SESSION*>(client_rses);
}
/**
@ -613,6 +613,7 @@ routeQuery(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session, GWBUF *queu
}
bool valid;
char* trc = NULL;
if (rses_is_closed || backend_dcb == NULL ||
(valid = !connection_is_valid(inst, router_cli_ses)))
@ -623,8 +624,6 @@ routeQuery(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session, GWBUF *queu
}
char* trc = NULL;
switch (mysql_command)
{
case MXS_COM_CHANGE_USER: