aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree/utils.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/utils.cpp
parentAdd events which are fired when a service is added or deleted. (diff)
Fix a ton of -Wsign-conversion warnings.
Diffstat (limited to 'src/modules/m_spanningtree/utils.cpp')
-rw-r--r--src/modules/m_spanningtree/utils.cpp4
1 files changed, 2 insertions, 2 deletions
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<TreeSocket*, std::pair<std::string, int> >::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();