summaryrefslogtreecommitdiff
path: root/src/servers.cpp
diff options
context:
space:
mode:
authorAdam <Adam@drink-coca-cola.info>2010-05-14 20:35:38 -0400
committerAdam <Adam@anope.org>2010-06-18 21:01:53 -0400
commitf049124905bd9f53439293e873003cb027a17b91 (patch)
tree352ed9251fd47055dd770aa2d5eabb20247e4b43 /src/servers.cpp
parent81a45520a773732c9f46785f27aa1956150775d7 (diff)
Rewrote the hashing system to use std::tr1::unordered_map
Diffstat (limited to 'src/servers.cpp')
-rw-r--r--src/servers.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/servers.cpp b/src/servers.cpp
index 77876372e..f058274d4 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -80,7 +80,7 @@ Server::Server(Server *uplink, const std::string &name, unsigned int hops, const
if (LogChan && ircd->join2msg)
{
/* XXX might desync */
- ircdproto->SendJoin(findbot(Config.s_GlobalNoticer), Config.LogChannel, time(NULL));
+ ircdproto->SendJoin(Global, Config.LogChannel, time(NULL));
}
}
}
@@ -93,12 +93,12 @@ Server::~Server()
if (Capab.HasFlag(CAPAB_NOQUIT) || Capab.HasFlag(CAPAB_QS))
{
- User *nextu;
time_t t = time(NULL);
- for (User *u = firstuser(); u; u = nextu)
+ for (user_map::const_iterator it = UserListByNick.begin(); it != UserListByNick.end();)
{
- nextu = nextuser();
+ User *u = it->second;
+ ++it;
if (u->server == this)
{
@@ -402,7 +402,7 @@ void do_squit(const char *source, int ac, const char **av)
if (s->HasFlag(SERVER_JUPED))
{
snprintf(buf, BUFSIZE, "Received SQUIT for juped server %s", s->GetName().c_str());
- ircdproto->SendGlobops(findbot(Config.s_OperServ), buf);
+ ircdproto->SendGlobops(OperServ, buf);
}
snprintf(buf, sizeof(buf), "%s %s", s->GetName().c_str(), s->GetUplink()->GetName().c_str());