MXS-2220 server_alloc returns internal type
Also adds default initializers to SERVER fields.
This commit is contained in:
@ -50,6 +50,7 @@
|
||||
#include <maxscale/utils.h>
|
||||
#include <maxscale/utils.hh>
|
||||
#include <maxscale/paths.h>
|
||||
#include "../../../core/internal/server.hh"
|
||||
|
||||
/* The router entry points */
|
||||
static MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params);
|
||||
@ -810,7 +811,7 @@ static MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params
|
||||
{"authenticator", "MySQLBackendAuth"}
|
||||
}, config_server_params);
|
||||
|
||||
SERVER* server = server_alloc("binlog_router_master_host", p.params());
|
||||
Server* server = Server::server_alloc("binlog_router_master_host", p.params());
|
||||
|
||||
if (server == NULL)
|
||||
{
|
||||
|
@ -40,6 +40,7 @@
|
||||
#include <maxscale/utils.hh>
|
||||
#include "../../../../core/internal/modules.hh"
|
||||
#include "../../../../core/internal/config.hh"
|
||||
#include "../../../../core/internal/server.hh"
|
||||
|
||||
#include <maxscale/protocol/mysql.hh>
|
||||
#include <ini.h>
|
||||
@ -142,7 +143,7 @@ int main(int argc, char** argv)
|
||||
{"authenticator", "MySQLBackendAuth"}
|
||||
}, config_server_params);
|
||||
|
||||
SERVER* server = server_alloc("binlog_router_master_host", p.params());
|
||||
Server* server = Server::server_alloc("binlog_router_master_host", p.params());
|
||||
if (server == NULL)
|
||||
{
|
||||
printf("Failed to allocate 'server' object\n");
|
||||
|
Reference in New Issue
Block a user