Merge branch 'master+ircstring'

[user/henk/code/inspircd.git] / src / modules / extra / m_mssql.cpp

diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 38bf60e400a3a13ff4bc3aa52d2d4345b2e2bb87..0e8c8cf5528cd768421e51b62073ac39870e6a15 100644 (file)
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -24,21 +24,17 @@
 #include "inspircd.h"
 #include <tds.h>
 #include <tdsconvert.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 #include "m_sqlv2.h"
 
 /* $CompileFlags: exec("grep VERSION_NO /usr/include/tdsver.h 2>/dev/null | perl -e 'print "-D_TDSVER=".((<> =~ /freetds v(\d+\.\d+)/i) ? $1*100 : 0);'") */
 /* $LinkerFlags: -ltds */
-/* $ModDep: m_sqlv2.h */
 
 class SQLConn;
 class MsSQLResult;
 class ModuleMsSQL;
 
-typedef std::map<std::string, SQLConn*> ConnMap;
+typedef insp::flat_map<std::string, SQLConn*> ConnMap;
 typedef std::deque<MsSQLResult*> ResultQueue;
 
 unsigned long count(const char * const str, char a)
@@ -656,9 +652,7 @@ class ModuleMsSQL : public Module
        {
                ReadConf();
 
-               ServerInstance->Threads->Start(queryDispatcher);
-
-               ServerInstance->Modules->AddService(sqlserv);
+               ServerInstance->Threads.Start(queryDispatcher);
        }
 
        ~ModuleMsSQL()
@@ -780,7 +774,7 @@ class ModuleMsSQL : public Module
                connections.clear();
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                queryDispatcher->LockQueue();
                ReadConf();