summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-15 22:58:24 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-15 22:58:24 +0000
commitab01aaeeee9aed655df2eec2522072233fe3aa57 (patch)
treeba5f3d6f130e6363491afe8d2d1808c8033a8878 /include
parenta551203100f50ff4767d516566f38277bd268110 (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/channels.h10
-rw-r--r--include/connection.h4
-rw-r--r--include/message.h2
-rw-r--r--include/modules.h2
-rw-r--r--include/users.h4
5 files changed, 10 insertions, 12 deletions
diff --git a/include/channels.h b/include/channels.h
index 7df2d665e..7771c292d 100644
--- 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 b84d39df9..c92934c3f 100644
--- 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 f6865453c..d00cae30e 100644
--- 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 da2bfe023..26fea050d 100644
--- 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 2dda51984..7077aaa56 100644
--- 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