Merge branch 'master+listmode'

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

diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index 9f8d68427b0c5758daa534bc8b0c48d87ed55fac..10469f37054dcc55e89a99113550368675ded981 100644 (file)
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -23,11 +23,11 @@
 #include <ldap.h>
 
 #ifdef _WIN32
-# pragma comment(lib, "libldap.lib")
+# pragma comment(lib, "libldap_r.lib")
 # pragma comment(lib, "liblber.lib")
 #endif
 
-/* $LinkerFlags: -lldap */
+/* $LinkerFlags: -lldap_r */
 
 class LDAPService : public LDAPProvider, public SocketThread
 {
@@ -532,7 +532,7 @@ class LDAPService : public LDAPProvider, public SocketThread
 
 class ModuleLDAP : public Module
 {
-       typedef std::map<std::string, LDAPService*> ServiceMap;
+       typedef insp::flat_map<std::string, LDAPService*> ServiceMap;
        ServiceMap LDAPServices;
 
  public:
@@ -610,7 +610,7 @@ class ModuleLDAP : public Module
 
        ~ModuleLDAP()
        {
-               for (std::map<std::string, LDAPService*>::iterator i = LDAPServices.begin(); i != LDAPServices.end(); ++i)
+               for (ServiceMap::iterator i = LDAPServices.begin(); i != LDAPServices.end(); ++i)
                {
                        LDAPService* conn = i->second;
                        conn->join();