MXS-2220 server_alloc returns internal type

Also adds default initializers to SERVER fields.
2018-12-11 15:27:52 +02:00
parent 3f81a37e70
commit 6209d737e9
16 changed files with 135 additions and 154 deletions
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@ -39,6 +39,7 @@
 #include "internal/modules.hh"
 #include "internal/monitor.hh"
 #include "internal/query_classifier.hh"
+#include "internal/server.hh"

 typedef std::set<std::string>    StringSet;
 typedef std::vector<std::string> StringVector;
@ -241,7 +242,7 @@ bool runtime_create_server(const char* name,
                config_replace_param(&ctx, "authenticator", authenticator);
            }

-            SERVER* server = server_alloc(name, ctx.parameters);
+            Server* server = Server::server_alloc(name, ctx.parameters);

            if (server && server_serialize(server))
            {