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 8f8fe080fbd2c99483c56e8b4bebacf59e6b928e..0e8c8cf5528cd768421e51b62073ac39870e6a15 100644 (file)
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -24,9 +24,6 @@
 #include "inspircd.h"
 #include <tds.h>
 #include <tdsconvert.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 #include "m_sqlv2.h"
 
@@ -37,7 +34,7 @@ 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)
@@ -655,7 +652,7 @@ class ModuleMsSQL : public Module
        {
                ReadConf();
 
-               ServerInstance->Threads->Start(queryDispatcher);
+               ServerInstance->Threads.Start(queryDispatcher);
        }
 
        ~ModuleMsSQL()