From 36040be2952186d56a6646ee7d972aaafdd4e31a Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 17 Nov 2017 00:02:03 +0000 Subject: Fix a ton of -Wsign-conversion warnings. --- src/modules/m_spanningtree/utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules/m_spanningtree/utils.cpp') diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index 79dc24e6a..0a96ecfcd 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -118,7 +118,7 @@ CullResult SpanningTreeUtilities::cull() sock->Close(); } - for(std::map >::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i) + for(TimeoutList::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i) { TreeSocket* s = i->first; s->Close(); @@ -235,7 +235,7 @@ void SpanningTreeUtilities::ReadConfiguration() if (PingFreq == 0) PingFreq = 60; - if (PingWarnTime < 0 || PingWarnTime > PingFreq - 1) + if (PingWarnTime > PingFreq - 1) PingWarnTime = 0; AutoconnectBlocks.clear(); -- cgit v1.3.1-10-gc9f91