aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/m_spanningtree/main.cpp
diff options
context:
space:
mode:
authorGravatar Peter Powell2017-11-17 00:02:03 +0000
committerGravatar Peter Powell2017-11-17 15:33:01 +0000
commit36040be2952186d56a6646ee7d972aaafdd4e31a (patch)
tree72be7108a94dd6bd0ea2842c53ba8890c44d12d8 /src/modules/m_spanningtree/main.cpp
parentAdd events which are fired when a service is added or deleted. (diff)
downloadinspircd++-36040be2952186d56a6646ee7d972aaafdd4e31a.tar.gz
inspircd++-36040be2952186d56a6646ee7d972aaafdd4e31a.tar.bz2
inspircd++-36040be2952186d56a6646ee7d972aaafdd4e31a.zip
Fix a ton of -Wsign-conversion warnings.
Diffstat (limited to 'src/modules/m_spanningtree/main.cpp')
-rw-r--r--src/modules/m_spanningtree/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 2d76102bc..4acd15d62 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -273,12 +273,12 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime)
void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
{
- std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = Utils->timeoutlist.begin();
+ SpanningTreeUtilities::TimeoutList::iterator i = Utils->timeoutlist.begin();
while (i != Utils->timeoutlist.end())
{
TreeSocket* s = i->first;
- std::pair<std::string, int> p = i->second;
- std::map<TreeSocket*, std::pair<std::string, int> >::iterator me = i;
+ std::pair<std::string, unsigned int> p = i->second;
+ SpanningTreeUtilities::TimeoutList::iterator me = i;
i++;
if (s->GetLinkState() == DYING)
{
@@ -287,7 +287,7 @@ void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
}
else if (curtime > s->age + p.second)
{
- ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %d seconds)",p.first.c_str(),p.second);
+ ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %u seconds)",p.first.c_str(),p.second);
Utils->timeoutlist.erase(me);
s->Close();
}