Changed to use __single_client_alloc, faster on most systems in a single thread

Specified namespace std in *all* files

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1404 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/channels.h b/include/channels.h
index 7df2d665e76ec494e76a5632e45a1e9a3edb44ef..7771c292d04830095601a33944f30b6808cd4b6b 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -84,15 +84,15 @@ class ModeParameter : public classbase
 
 /** Holds a complete ban list
  */
-typedef std::vector<BanItem>   BanList;
+typedef std::vector<BanItem, __single_client_alloc>    BanList;
 
 /** Holds a complete exempt list
  */
-typedef std::vector<ExemptItem>        ExemptList;
+typedef std::vector<ExemptItem, __single_client_alloc> ExemptList;
 
 /** Holds a complete invite list
  */
-typedef std::vector<InviteItem>        InviteList;
+typedef std::vector<InviteItem, __single_client_alloc> InviteList;
 
 /** Holds all relevent information for a channel.
  * This class represents a channel, and contains its name, modes, time created, topic, topic set time,
@@ -112,7 +112,7 @@ class chanrec : public Extensible
        /** User list (casted to char*'s to stop forward declaration stuff)
         * (chicken and egg scenario!)
         */
-       std::vector<char*> internal_userlist;
+       std::vector<char*, __single_client_alloc> internal_userlist;
        
        /** Channel topic.
         * If this is an empty string, no channel topic is set.
@@ -196,7 +196,7 @@ class chanrec : public Extensible
         * The resulting pointer to the vector should be considered
         * readonly and only modified via AddUser and DelUser.
         */
-       std::vector<char*> *GetUsers();
+       std::vector<char*, __single_client_alloc> *GetUsers();
 
        /** Creates a channel record and initialises it with default values
         */

diff --git a/include/connection.h b/include/connection.h
index b84d39df9b42b623270980d91dfd2601eae94696..c92934c3f229dfbfa5d6af0aed2aaa4e94841880 100644 (file)
--- a/include/connection.h
+++ b/include/connection.h
@@ -110,7 +110,7 @@ class ircd_connector : public Extensible
         * So for A->B->C, if this was the record for B it would contain A and C
         * whilever both servers are connected to B.
         */
-       std::vector<std::string> routes;
+       std::vector<std::string, __single_client_alloc> routes;
        
 
        /** Create an outbound connection to a listening socket
@@ -273,7 +273,7 @@ class connection : public Extensible
        /** With a serverrec, this is a list of all established server connections.
         * With a userrec this is unused.
         */
-       std::vector<ircd_connector> connectors;
+       std::vector<ircd_connector, __single_client_alloc> connectors;
        
        /** Default constructor
         */

diff --git a/include/message.h b/include/message.h
index f6865453cbdf5c7fd42d2cabe58639595b5c3372..d00cae30e5fc5d1543361dc10c97c6eed99160f1 100644 (file)
--- a/include/message.h
+++ b/include/message.h
@@ -31,8 +31,6 @@
 int common_channels(userrec *u, userrec *u2);
 void chop(char* str);
 void tidystring(char* str);
-void safedelete(chanrec *p);
-void safedelete(userrec *p);
 void Blocking(int s);
 void NonBlocking(int s);
 int CleanAndResolve (char *resolvedHost, const char *unresolvedHost);

diff --git a/include/modules.h b/include/modules.h
index da2bfe023ec0079902b02d19e0484a9c21969e65..26fea050df70d030ff6119cb7968d0e6df6e1da8 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -69,7 +69,7 @@ typedef file_cache string_list;
 
 /** Holds a list of users in a channel
  */
-typedef std::deque<userrec*> chanuserlist;
+typedef std::deque<userrec*, __single_client_alloc> chanuserlist;
 
 
 // This #define allows us to call a method in all

diff --git a/include/users.h b/include/users.h
index 2dda519840bdb52747856ce25d28b9c5bcc30b39..7077aaa5626cc053b735a8a2b6ace42a98019481 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -91,13 +91,13 @@ class ConnectClass : public classbase
 
 /** Holds a complete list of all channels to which a user has been invited and has not yet joined.
  */
-typedef std::vector<Invited> InvitedList;
+typedef std::vector<Invited, __single_client_alloc> InvitedList;
 
 
 
 /** Holds a complete list of all allow and deny tags from the configuration file (connection classes)
  */
-typedef std::vector<ConnectClass> ClassVector;
+typedef std::vector<ConnectClass, __single_client_alloc> ClassVector;
 
 /** Holds all information about a user
  * This class stores all information about a user connected to the irc server. Everything about a

diff --git a/src/channels.cpp b/src/channels.cpp
index 1904bfa26c561e2a367138174c4705cbbdc5281f..4bbb69b9b5867fd743d4fd9d7901d616ef768a1b 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -53,11 +55,9 @@
 #define nspace std
 #endif
 
-using namespace std;
-
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern std::vector<Module*, __single_client_alloc> modules;
+extern std::vector<ircd_module*, __single_client_alloc> factory;
 
 extern int LogLevel;
 extern char ServerName[MAXBUF];
@@ -83,8 +83,7 @@ extern int NetBufferSize;
 int MaxWhoResults;
 extern time_t nb_start;
 
-extern std::vector<int> fd_reap;
-extern std::vector<std::string> module_names;
+extern std::vector<std::string, __single_client_alloc> module_names;
 
 extern int boundPortCount;
 extern int portCount;
@@ -103,7 +102,7 @@ extern time_t TIME;
 
 using namespace std;
 
-std::vector<ModeParameter> custom_mode_params;
+std::vector<ModeParameter, __single_client_alloc> custom_mode_params;
 
 chanrec::chanrec()
 {
@@ -159,7 +158,7 @@ void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
        {
                if (custom_mode_params.size())
                {
-                       for (vector<ModeParameter>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
+                       for (vector<ModeParameter, __single_client_alloc>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
                        {
                                if ((i->mode == mode) && (!strcasecmp(this->name,i->channel)))
                                {
@@ -183,7 +182,7 @@ std::string chanrec::GetModeParameter(char mode)
 {
        if (custom_mode_params.size())
        {
-               for (vector<ModeParameter>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
+               for (vector<ModeParameter, __single_client_alloc>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
                {
                        if ((i->mode == mode) && (!strcasecmp(this->name,i->channel)))
                        {
@@ -207,7 +206,7 @@ void chanrec::AddUser(char* castuser)
 
 void chanrec::DelUser(char* castuser)
 {
-       for (std::vector<char*>::iterator a = internal_userlist.begin(); a < internal_userlist.end(); a++)
+       for (std::vector<char*, __single_client_alloc>::iterator a = internal_userlist.begin(); a < internal_userlist.end(); a++)
        {
                if (*a == castuser)
                {
@@ -219,7 +218,7 @@ void chanrec::DelUser(char* castuser)
        log(DEBUG,"BUG BUG BUG! Attempt to remove an uncasted user from the internal list of %s!",name);
 }
 
-std::vector<char*> *chanrec::GetUsers()
+std::vector<char*, __single_client_alloc> *chanrec::GetUsers()
 {
        return &internal_userlist;
 }

diff --git a/src/commands.cpp b/src/commands.cpp
index d1d28bd566ca8fb5a36b20fe8b03aeacddfa6a23..e3ff3f74cf2a22d4dc10ee3a0b41af81f276bc83 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -62,8 +64,6 @@
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-using namespace std;
-
 #ifdef USE_KQUEUE
 extern int kq;
 #endif
@@ -1033,7 +1033,7 @@ void handle_who(char **parameters, int pcnt, userrec *user)
        {
                 if ((!strcmp(parameters[0],"0")) || (!strcmp(parameters[0],"*")) && (!strcmp(parameters[1],"o")))
                 {
-                       for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+                       for (std::vector<userrec*, __single_client_alloc>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
                         {
                                // If i were a rich man.. I wouldn't need to me making these bugfixes..
                                // But i'm a poor bastard with nothing better to do.
@@ -2575,7 +2575,7 @@ void handle_amp(char token,char* params,serverrec* source,serverrec* reply, char
                {
                        if (me[i] != NULL)
                        {
-                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               for (vector<ircd_connector, __single_client_alloc>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
                                {
                                        if (!strcasecmp(j->GetServerName().c_str(),params))
                                        {

diff --git a/src/connection.cpp b/src/connection.cpp
index 384f626e2f2f59f0cbefa57ec3fa6d9bc5d29897..b627c24945d8926b66538d4adaa3291d92b5358d 100644 (file)
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <connection.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -30,13 +32,11 @@
 #include "inspstring.h"
 #include "helperfuncs.h"
 
-using namespace std;
-
 
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern std::vector<Module*, __single_client_alloc> modules;
+extern std::vector<ircd_module*, __single_client_alloc> factory;
 
-std::deque<std::string> xsums;
+std::deque<std::string, __single_client_alloc> xsums;
 
 extern int MODCOUNT;
 

diff --git a/src/dns.cpp b/src/dns.cpp
index 165e3100d0adad42f6ccf5052bb0e89093a47562..28b131586454d5cf2c2f007813f4c35e60aab347 100644 (file)
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -17,6 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #define _DNS_C
 
+using namespace std;
+
 #include <string>
 #include <stdlib.h>
 #include <time.h>

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 2aa309ad3eb14d73e87c7a9c46230baa92f799bf..cc7aeb0b99e0ddb86a58f2572d2ee26e47ba14c4 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "globals.h"
 #include <dlfcn.h>
 #include "dynamic.h"

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 70c592b1d537ab848abcd652f6ab95a3df30ecf2..13e28ea152e22222b8eb4872ed36c734be1cefbb 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <string>
 #include "inspircd.h"
 #include "hashcomp.h"

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index c99ffdcf8af5b6cdb2a2b92788862d729acc533e..f418320e6e527d0ea8c020d63b8a1b74a355d666 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -48,8 +50,6 @@
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-using namespace std;
-
 extern int MODCOUNT;
 extern std::vector<Module*, __single_client_alloc> modules;
 
@@ -283,7 +283,7 @@ void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        std::vector<char*> *ulist = Ptr->GetUsers();
+        std::vector<char*, __single_client_alloc> *ulist = Ptr->GetUsers();
         for (int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
@@ -310,7 +310,7 @@ void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        std::vector<char*> *ulist = Ptr->GetUsers();
+        std::vector<char*, __single_client_alloc> *ulist = Ptr->GetUsers();
         for (int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
@@ -343,7 +343,7 @@ void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
         va_end(argsPtr);
 
 
-        std::vector<char*> *ulist = Ptr->GetUsers();
+        std::vector<char*, __single_client_alloc> *ulist = Ptr->GetUsers();
         for (int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
@@ -369,7 +369,7 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        std::vector<char*> *ulist = Ptr->GetUsers();
+        std::vector<char*, __single_client_alloc> *ulist = Ptr->GetUsers();
         for (int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
@@ -428,7 +428,7 @@ void WriteCommon(userrec *u, char* text, ...)
         {
                 if (u->chans[i].channel)
                 {
-                        std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
+                        std::vector<char*, __single_client_alloc> *ulist = u->chans[i].channel->GetUsers();
                         for (int j = 0; j < ulist->size(); j++)
                         {
                                 char* o = (*ulist)[j];
@@ -478,7 +478,7 @@ void WriteCommonExcept(userrec *u, char* text, ...)
         {
                 if (u->chans[i].channel)
                 {
-                        std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
+                        std::vector<char*, __single_client_alloc> *ulist = u->chans[i].channel->GetUsers();
                         for (int j = 0; j < ulist->size(); j++)
                         {
                                 char* o = (*ulist)[j];
@@ -510,7 +510,7 @@ void WriteOpers(char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+        for (std::vector<userrec*, __single_client_alloc>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
         {
                 userrec* a = *i;
                 if ((a) && (a->fd != FD_MAGIC_NUMBER))
@@ -538,7 +538,7 @@ void NoticeAllOpers(userrec *source, bool local_only, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+        for (std::vector<userrec*,__single_client_alloc>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
         {
                 userrec* a = *i;
                 if ((a) && (a->fd != FD_MAGIC_NUMBER))
@@ -564,7 +564,7 @@ bool ChanAnyOnThisServer(chanrec *c,char* servername)
 {
         log(DEBUG,"ChanAnyOnThisServer");
 
-        std::vector<char*> *ulist = c->GetUsers();
+        std::vector<char*, __single_client_alloc> *ulist = c->GetUsers();
         for (int j = 0; j < ulist->size(); j++)
         {
                 char* o = (*ulist)[j];
@@ -585,7 +585,7 @@ bool CommonOnThisServer(userrec* u,const char* servername)
         {
                 if (u->chans[i].channel)
                 {
-                        std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
+                        std::vector<char*, __single_client_alloc> *ulist = u->chans[i].channel->GetUsers();
                         for (int j = 0; j < ulist->size(); j++)
                         {
                                 char* o = (*ulist)[j];
@@ -1102,7 +1102,7 @@ void userlist(userrec *user,chanrec *c)
 
         snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
 
-        std::vector<char*> *ulist = c->GetUsers();
+        std::vector<char*, __single_client_alloc> *ulist = c->GetUsers();
         for (int i = 0; i < ulist->size(); i++)
         {
                 char* o = (*ulist)[i];

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index ccf91b6decda72366a6a790ce9dbea6602410799..e077c939ad2b0e283823fb7bce3d75109a155b61 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -165,7 +165,7 @@ void AddOper(userrec* user)
 
 void DeleteOper(userrec* user)
 {
-        for (std::vector<userrec*>::iterator a = all_opers.begin(); a < all_opers.end(); a++)
+        for (std::vector<userrec*, __single_client_alloc>::iterator a = all_opers.begin(); a < all_opers.end(); a++)
         {
                 if (*a == user)
                 {
@@ -385,10 +385,10 @@ void ReadConfig(bool bail, userrec* user)
        {
                log(DEFAULT,"Adding and removing modules due to rehash...");
 
-               std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
+               std::vector<std::string, __single_client_alloc> old_module_names, new_module_names, added_modules, removed_modules;
 
                // store the old module names
-               for (std::vector<std::string>::iterator t = module_names.begin(); t != module_names.end(); t++)
+               for (std::vector<std::string, __single_client_alloc>::iterator t = module_names.begin(); t != module_names.end(); t++)
                {
                        old_module_names.push_back(*t);
                }
@@ -402,10 +402,10 @@ void ReadConfig(bool bail, userrec* user)
 
                // now create a list of new modules that are due to be loaded
                // and a seperate list of modules which are due to be unloaded
-               for (std::vector<std::string>::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++)
+               for (std::vector<std::string, __single_client_alloc>::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++)
                {
                        bool added = true;
-                       for (std::vector<std::string>::iterator old = old_module_names.begin(); old != old_module_names.end(); old++)
+                       for (std::vector<std::string, __single_client_alloc>::iterator old = old_module_names.begin(); old != old_module_names.end(); old++)
                        {
                                if (*old == *_new)
                                        added = false;
@@ -413,10 +413,10 @@ void ReadConfig(bool bail, userrec* user)
                        if (added)
                                added_modules.push_back(*_new);
                }
-               for (std::vector<std::string>::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++)
+               for (std::vector<std::string, __single_client_alloc>::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++)
                {
                        bool removed = true;
-                       for (std::vector<std::string>::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++)
+                       for (std::vector<std::string, __single_client_alloc>::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++)
                        {
                                if (*newm == *oldm)
                                        removed = false;
@@ -428,7 +428,7 @@ void ReadConfig(bool bail, userrec* user)
                // to be removed.
                int rem = 0, add = 0;
                if (!removed_modules.empty())
-               for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
+               for (std::vector<std::string, __single_client_alloc>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
                {
                        if (UnloadModule(removing->c_str()))
                        {
@@ -442,7 +442,7 @@ void ReadConfig(bool bail, userrec* user)
                        }
                }
                if (!added_modules.empty())
-               for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
+               for (std::vector<std::string, __single_client_alloc>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
                {
                        if (LoadModule(adding->c_str()))
                        {
@@ -1668,7 +1668,7 @@ void DoSplitEveryone()
                {
                        if (me[i] != NULL)
                        {
-                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               for (vector<ircd_connector, __single_client_alloc>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
                                {
                                        if (strcasecmp(j->GetServerName().c_str(),ServerName))
                                        {
@@ -2267,7 +2267,7 @@ void DoSplit(const char* params)
                {
                        if (me[i] != NULL)
                        {
-                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               for (vector<ircd_connector, __single_client_alloc>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
                                {
                                        if (!strcasecmp(j->GetServerName().c_str(),params))
                                        {
@@ -2315,7 +2315,7 @@ void RemoveServer(const char* name)
                {
                        if (me[i] != NULL)
                        {
-                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               for (vector<ircd_connector, __single_client_alloc>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
                                {
                                        if (!strcasecmp(j->GetServerName().c_str(),name))
                                        {
@@ -2342,7 +2342,7 @@ char* ModuleError()
 void erase_factory(int j)
 {
        int v = 0;
-       for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
+       for (std::vector<ircd_module*, __single_client_alloc>::iterator t = factory.begin(); t != factory.end(); t++)
        {
                if (v == j)
                {
@@ -2357,7 +2357,7 @@ void erase_factory(int j)
 void erase_module(int j)
 {
        int v1 = 0;
-       for (std::vector<Module*>::iterator m = modules.begin(); m!= modules.end(); m++)
+       for (std::vector<Module*, __single_client_alloc>::iterator m = modules.begin(); m!= modules.end(); m++)
         {
                 if (v1 == j)
                 {
@@ -2369,7 +2369,7 @@ void erase_module(int j)
                v1++;
         }
        int v2 = 0;
-        for (std::vector<std::string>::iterator v = module_names.begin(); v != module_names.end(); v++)
+        for (std::vector<std::string, __single_client_alloc>::iterator v = module_names.begin(); v != module_names.end(); v++)
         {
                 if (v2 == j)
                 {

diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index fcbb83aaeb18a57cbc495f68cfda81a436b5f471..43e0eec0b4625b212c01eadb34a22bd5447c1bdd 100644 (file)
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/types.h>
@@ -28,8 +30,6 @@
 #include "inspstring.h"
 #include "helperfuncs.h"
 
-using namespace std;
-
 extern FILE *log_file;
 extern int boundPortCount;
 extern int openSockfd[MAXSOCKS];

diff --git a/src/inspircd_util.cpp b/src/inspircd_util.cpp
index 6238a5cf45dbb427e9f026ce7f109c921869441d..e4c8d561dac776a1802f789ad19fd1d77eca8351 100644 (file)
--- a/src/inspircd_util.cpp
+++ b/src/inspircd_util.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h" 
 #include "inspircd_io.h" 
 #include "inspircd_util.h" 

diff --git a/src/message.cpp b/src/message.cpp
index 1aeee4ae457554dc519ad60dea2c2b4e4b10aeb6..4fc32f79b88f6c322def67674732eee34de0bafc 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -46,11 +48,9 @@
 #include "dns.h"
 #include "helperfuncs.h"
 
-using namespace std;
-
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern std::vector<Module*, __single_client_alloc> modules;
+extern std::vector<ircd_module*, __single_client_alloc> factory;
 
 extern char ServerName[MAXBUF];
 
@@ -89,36 +89,6 @@ int common_channels(userrec *u, userrec *u2)
 }
 
 
-void safedelete(userrec *p)
-{
-       if (p)
-       {
-               log(DEBUG,"deleting %s %s %s %s",p->nick,p->ident,p->dhost,p->fullname);
-               log(DEBUG,"safedelete(userrec*): pointer is safe to delete");
-               delete p;
-               p = NULL;
-       }
-       else
-       {
-               log(DEBUG,"safedelete(userrec*): unsafe pointer operation squished");
-       }
-}
-
-void safedelete(chanrec *p)
-{
-       if (p)
-       {
-               delete p;
-               p = NULL;
-               log(DEBUG,"safedelete(chanrec*): pointer is safe to delete");
-       }
-       else
-       {
-               log(DEBUG,"safedelete(chanrec*): unsafe pointer operation squished");
-       }
-}
-
-
 void tidystring(char* str)
 {
        // strips out double spaces before a : parameter

diff --git a/src/mode.cpp b/src/mode.cpp
index 9af80bb003ab3df1a92eac907000cfce85ded3c9..285ec3e890aab5b760e09d8329a0ed8226a4ba55 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -45,12 +47,10 @@
 #include "inspstring.h"
 #include "helperfuncs.h"
 
-using namespace std;
-
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<std::string> module_names;
+extern std::vector<Module*, __single_client_alloc> modules;
+extern std::vector<ircd_module*, __single_client_alloc> factory;
+extern std::vector<std::string, __single_client_alloc> module_names;
 
 
 extern int LogLevel;

diff --git a/src/modules.cpp b/src/modules.cpp
index 63c764bbba6c42962df53254c05f2eb3458928cd..414cce617526203dd876c2d6d409f0ad24272d21 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -52,8 +54,6 @@
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-using namespace std;
-
 #ifdef USE_KQUEUE
 extern int kq;
 #endif
@@ -391,8 +391,8 @@ chanuserlist Server::GetUsers(chanrec* chan)
 {
        chanuserlist userl;
        userl.clear();
-       std::vector<char*> *list = chan->GetUsers();
-       for (std::vector<char*>::iterator i = list->begin(); i != list->end(); i++)
+       std::vector<char*, __single_client_alloc> *list = chan->GetUsers();
+       for (std::vector<char*, __single_client_alloc>::iterator i = list->begin(); i != list->end(); i++)
        {
                char* o = *i;
                userl.push_back((userrec*)o);
@@ -989,8 +989,8 @@ int FileReader::FileSize()
 }
 
 
-std::vector<Module*> modules(255);
-std::vector<ircd_module*> factory(255);
+std::vector<Module*, __single_client_alloc> modules(255);
+std::vector<ircd_module*, __single_client_alloc> factory(255);
 
 int MODCOUNT  = -1;
 

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 559bb686ae4ab0279e716bbd0e0f0e38f76a545c..2619b7b216426f3db167f68d3b3d13f2dad4aedf 100644 (file)
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 // Message and notice filtering using regex patterns
 // a module based on the original work done by Craig Edwards in 2003
 // for the chatspike network.

diff --git a/src/modules/extra/m_sql.cpp b/src/modules/extra/m_sql.cpp
index 28d24bc482626b9680e0138fdaaaa1a7a040365b..d25af102a5fb82af41bcd3565b53ac6c9e408565 100644 (file)
--- a/src/modules/extra/m_sql.cpp
+++ b/src/modules/extra/m_sql.cpp
@@ -14,6 +14,7 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
 
 #include <stdio.h>
 #include <string>

diff --git a/src/modules/extra/m_sql.h b/src/modules/extra/m_sql.h
index 5110146d98e590037008c046ed09e8b3c196fc3c..fd02c456b6fe8c15e7d30f90f2aea8141b6284fd 100644 (file)
--- a/src/modules/extra/m_sql.h
+++ b/src/modules/extra/m_sql.h
@@ -1,6 +1,8 @@
 #ifndef __M_SQL_H__
 #define __M_SQL_H__
 
+using namespace std;
+
 #include <string>
 #include <vector>
 

diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 46721e0989dc49bde27daaaee1fc6c1301f93af3..16274de26e14f25d4a3b01836c792bad1fcbfd3c 100644 (file)
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <stdlib.h>

diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index 03501265095640fe8653fab2802a5887db9d77fd..bffed5dd9b69d3dab2f356467ddd446c56ebc1a7 100644 (file)
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <stdlib.h>

diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index 6ba379fac53aca62a6f692470f2432e4de20037b..51c26a749be61e1ead24a12d333f3e11784101fd 100644 (file)
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <stdlib.h>

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index c12e367fd7459ae5784e4cc3e2483154e66ec01d..b5f62f584de361ee300597b79bc41ac26da0981e 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"

diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 3b57d9d093e7e9d1bd1a583adcef00990187cdd3..8351969e927b79c44859d2bbcc7306bf3844e0d9 100644 (file)
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -13,6 +13,7 @@
  *
  * ---------------------------------------------------
  */
+using namespace std;
 
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 6ba86e59555f227820ab35b5a52ea40c8b1ac6db..13663cc4007b2046fe2989275bca4b8feca532c5 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <sstream>
 #include "users.h"

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 69a9495a5d71650cd2f4c4ff8bd2bb199335b4ae..0156775369a082cb33d1e8308433e24c9c42c425 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 64a01b8fc119408c5b4a61734e14eeead9977066..697e8f5d459fe539839d2b4bc6415fa67a78e2c4 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index c8896cf0a4399293277a00cb9d5e2d6a732ce3d2..1d10bcd08129e3c847f000eda7012ab87ee50234 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <vector>

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 66457b928d6c97faeaaf66e1f80fd35d83f8acf5..6314cca945e44297df7d745ae1235501e682c77b 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 32d37f2a083791d6e7a4b2b3f6c2e7e4ab9c2c6c..e1cc5a8cb037f86b7b36f390d0affd45d9efc9bb 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index c6595eb6cf0967c6fba281b43a2d5c6ec5c3c560..73b09b423d116541b0a576f7e185ee1013ac52c1 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 // Hostname cloaking (+x mode) module for inspircd.
 // version 1.0.0.1 by brain (C. J. Edwards) Mar 2004.
 //

diff --git a/src/modules/m_conn_lusers.cpp b/src/modules/m_conn_lusers.cpp
index a16df457018cd45665c213fe921e8a214ac53a6a..c0106566a2f640d98dcfb41782ae34bedf2fe8c1 100644 (file)
--- a/src/modules/m_conn_lusers.cpp
+++ b/src/modules/m_conn_lusers.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 59a82d61012a78f78398e5f4b4a88a97bb3daa59..9995c1737e63b166fcdfe1f1cdcd22fe3a753a36 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 // Message and notice filtering using glob patterns
 // a module based on the original work done by Craig Edwards in 2003
 // for the chatspike network.

diff --git a/src/modules/m_foobar.cpp b/src/modules/m_foobar.cpp
index dd6b73afb703531b0e004d234e5e81818b60518b..81757799c17a351a94864f85762aa54aa0ed20ad 100644 (file)
--- a/src/modules/m_foobar.cpp
+++ b/src/modules/m_foobar.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 1e37e1fb98b0f88a9027c3935c6f307b56e203b1..d3714a960f775da9c721fba27dccddf191b9d1d2 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 // Globops and +g support module by C.J.Edwards
 
 #include <stdio.h>

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index bae4e73aefd1085cf1bea1e66bd7821419949c91..bbc64b78386e22f59f4661bf981d9615a51c31b7 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"

diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index ffc9d3635022a9f3dd6d65f850b480b7c26d0d69..36cd3ea70ec954babc31286fd0a9c603d890d5bf 100644 (file)
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 0e79cf496023d8cbbedef47df787400f8e11dbf3..6bbc58e97abc6168bdd9fbe321a678b3596b5b25 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <stdlib.h>

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 9553b619e17b31a96acb989c1d6923f577998f60..171e7045aa3ff051462375c694279c26bc471c48 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 336a008c997b9af3857eef98d832bc2be532cab4..70fbcac620b91b5db18c0723cba9bb498a1571a9 100644 (file)
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index a3c82bd151bf5253575a4d17ef495040d916576d..72fb4858c261323a859a4262f278f5a683adde15 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 868af242bb2fe6912cfeac32dc0bbac158f8c356..047af90474466e1c72fd2dd2589f5ebfd6b4fc4b 100644 (file)
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index df2f98c84f1ce1f6d0859ba2a84cd57039f718da..cade4f340800f0a6dda1fd650bca27681bb4dc87 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 3591b954d8c498f0df8bd7e68fc210251c9d9546..1f44bfef6265866ba948f42308473518cd685e83 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 85aa9b913608b069af534e8015964dbe7e0db9f4..563b94b12a3e53e50bc0f453196399dc89607577 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 236c277f920ae43da55826f7fb0d11becd52e578..bd3d750bd3b3432bd0ee222736f5fd2e03cffa59 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 5a4eebccf4b90bebd25f779e7da3e4659d5b2ab7..980fcc651ac8fabf6cd654ccfa990aea540b2115 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,5 +1,7 @@
 // operjoin module by typobox43
 
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 271c3cb4533446d7f50b81720b5ed7cc90ca492f..a112040f9b96469b9f0b3edc26b577a23c877473 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,3 +1,5 @@
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"

diff --git a/src/modules/m_opermd5.cpp b/src/modules/m_opermd5.cpp
index d7951d15384ee8fcff73d495af7b65fad5d5a4c4..c2b923929f5ec3cca416651287da879c6e159b33 100644 (file)
--- a/src/modules/m_opermd5.cpp
+++ b/src/modules/m_opermd5.cpp
@@ -16,6 +16,8 @@
 
 /* $ModDesc: Allows for MD5 encrypted oper passwords */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index d52bb01621976a306cb238d0458a9b467226eae3..ffdb7da9032b2f3fae0f041ae6c316fa5483a185 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,5 +1,7 @@
 // opermotd module by typobox43
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 80066bb0f2c5f9cf244202b2a867e906b08dbe33..459f99ca9ff143db852585b7111fe31608530dd4 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_park.cpp b/src/modules/m_park.cpp
index 1cf69b46fea9a2dc9e72b9382ee693b9195483bc..28733298f93d9891032518b1cc8ac8dc3db17875 100644 (file)
--- a/src/modules/m_park.cpp
+++ b/src/modules/m_park.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <vector>

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 5cd8a8572f6f82ac6d72d316f08320175773e4ca..67f4bcb95e2b6bfb942b7d16f39ec0cb12dfc1a0 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fstream>

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index f5df15945327b83d87bb4820833831869bf22673..2433896a86762c188c2b961fe05ac71c9005a038 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 0c9a29a1d151834b80ced4fbb99888fd52c3d864..da4fc49d7c45026b7231e27eb421b5ff7cab9d3d 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -1,6 +1,8 @@
 /* Support for a dancer-style /remove command, an alternative to /kick to try and avoid auto-rejoin-on-kick scripts */
 /* Written by Om, 25-03-05 */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index a56df61776821819164269242f333e586cc77d88..d06223d4e6ba8df37493bbcb5837db0a4e02b96c 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 5d64535554fb80d3e7d1102d646511b19b8b60a1..d73b4047d73663b8d3f1a836dba8c43c7704be4a 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <vector>

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index f1da3d1ed6b50f56928c59fa8b117d53e1fd0aa6..038d511f6d2bfbe55db69ea1f1600bd030c15282 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 9e96b9ed6b10c38c33fe74c3e3cc729735e76bcb..a20cb9ab96382a076a35e528256c3fee6141efd0 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 /*
  * SAMODE module for InspIRCd
  *  Co authored by Brain and w00t

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 6b874f2720bc8dda68842d77ed86d20dd1d19a0d..4de8cf55dfbe97646a8f733ea3a5d6c62188cf69 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 1037ecc14b779eae0ef65168d88c4c88d283c532..4c7927a64fa8ad4df24044c25ee659a79adcf748 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 525e5b71698241341d49f916b4cbc80fdd3f78f2..40c81ccb00df8ca35b851d07c4f78d1d69b39615 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 /*
  * SAQUIT module for InspIRCd
  *  Author: w00t

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 929c45f901ad4b7e30f76a15db06f10040ca744f..5b99ea76b2552ae85819aa8a264aea0e1a9b6e3a 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 0afffd6c15220f6d2d262c7f098a4da3323deae4..c064bbe0baeaa3a9759d61fa65ce4889cf2482f4 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index 20863500918eb1fa2224636b36eafb14b55d0c54..6b2778e79f60d3cd5428c3ad8b2e8ba81206982e 100644 (file)
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 8a481a3b43745179327609632549817a4dc1f791..2d59cb7b830f831874e3717825b60df50750e7fc 100644 (file)
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 6d3220658e5e00f748a171e9f8b70d3f79b13171..b7642a012b6de556fa4b719a08537b20c6852c1f 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,3 +1,5 @@
+using namespace std;
+
 // showwhois module by typobox43
 
 #include "users.h"

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 4f851f6a1301dd1e321d9549e4e205b0254089df..c423506a0c5338aebf68c8b2198b6acaa15772ef 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <vector>

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 8d8b03cc0655ceaf59fa94200798a511e1ace45f..ac9a645559b7d2ffc33b0e9ed133350ef9fef88f 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp
index f628585046e9255b0325dd0ed60af9f6d0357ae5..9644209574f55d08ccfc28d7ab118863137ef3b0 100644 (file)
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index c0511838c244878f273ed84ce8cf2e8c0101a3c5..884a029b99229cf70e502d563c5e90fb0b6a9b2f 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -14,12 +14,9 @@
  * ---------------------------------------------------
  */
 
-/* $ModDesc: Adds timed bans */
+using namespace std;
 
-/*
- * ToDo:
- *   Err... not a lot really.
- */ 
+/* $ModDesc: Adds timed bans */
 
 #include <stdio.h>
 #include <vector>

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index a077625c80a4cd2a40ee16b733804336fe480881..b2421ab43de793de609aedb653a298b7c331a387 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"

diff --git a/src/servers.cpp b/src/servers.cpp
index e95d8e7c0cccde9b78c84a1361816abb607e68ef..45ec5b00ec2e16869534cf71b9625cc076c8ef6c 100644 (file)
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd_config.h" 
 #include "servers.h"
 #include "inspircd.h"

diff --git a/src/users.cpp b/src/users.cpp
index 91542985ac39d4debe21b4ad5f37144d383fc18d..48bb12430e1dfdadf2a428fb229004416a269f0c 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd_config.h" 
 #include "channels.h"
 #include "users.h"

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index bf20ec7827b748114fe034084096547a1d8222c1..46d90bd0ed5d3ae6c04904dd52c7f37ae75b2ec4 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <string>
 #include "inspircd_config.h"
 #include "inspircd.h"

diff --git a/src/xline.cpp b/src/xline.cpp
index 7e96d0940e58a9ce38a854b8945d05551dffef8c..5b681444a99c89dc316cb4dfc9ec14fdef0dbe56 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -47,8 +49,6 @@
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-using namespace std;
-
 extern int MODCOUNT;
 extern std::vector<Module*, __single_client_alloc> modules;
 extern std::vector<ircd_module*, __single_client_alloc> factory;