summaryrefslogtreecommitdiff
path: root/src/channels.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/channels.cpp')
-rw-r--r--src/channels.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 4bbb69b9b..7d58bffd3 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -56,8 +56,8 @@ using namespace std;
#endif
extern int MODCOUNT;
-extern std::vector<Module*, __single_client_alloc> modules;
-extern std::vector<ircd_module*, __single_client_alloc> factory;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
extern int LogLevel;
extern char ServerName[MAXBUF];
@@ -83,7 +83,7 @@ extern int NetBufferSize;
int MaxWhoResults;
extern time_t nb_start;
-extern std::vector<std::string, __single_client_alloc> module_names;
+extern std::vector<std::string> module_names;
extern int boundPortCount;
extern int portCount;
@@ -102,7 +102,7 @@ extern time_t TIME;
using namespace std;
-std::vector<ModeParameter, __single_client_alloc> custom_mode_params;
+std::vector<ModeParameter> custom_mode_params;
chanrec::chanrec()
{
@@ -158,7 +158,7 @@ void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
{
if (custom_mode_params.size())
{
- for (vector<ModeParameter, __single_client_alloc>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
+ for (vector<ModeParameter>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
{
if ((i->mode == mode) && (!strcasecmp(this->name,i->channel)))
{
@@ -182,7 +182,7 @@ std::string chanrec::GetModeParameter(char mode)
{
if (custom_mode_params.size())
{
- for (vector<ModeParameter, __single_client_alloc>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
+ for (vector<ModeParameter>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
{
if ((i->mode == mode) && (!strcasecmp(this->name,i->channel)))
{
@@ -206,7 +206,7 @@ void chanrec::AddUser(char* castuser)
void chanrec::DelUser(char* castuser)
{
- for (std::vector<char*, __single_client_alloc>::iterator a = internal_userlist.begin(); a < internal_userlist.end(); a++)
+ for (std::vector<char*>::iterator a = internal_userlist.begin(); a < internal_userlist.end(); a++)
{
if (*a == castuser)
{
@@ -218,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*, __single_client_alloc> *chanrec::GetUsers()
+std::vector<char*> *chanrec::GetUsers()
{
return &internal_userlist;
}