summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2013-12-18 16:31:09 +0100
committerAttila Molnar <attilamolnar@hush.com>2013-12-18 16:31:09 +0100
commitba0802d8a8b173a559f149fefe9cd2b52a962c84 (patch)
tree615e2c2dcbdd48f35369c6521c1cdc5787e31fb9
parent1e8389b27ff99ad9f48c890486ebef936acafc41 (diff)
m_spanningtree Fix clang warning and wrong operator in if
-rw-r--r--src/modules/m_spanningtree/main.cpp2
-rw-r--r--src/modules/m_spanningtree/treesocket.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 017f1c522..39ff222c5 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -589,7 +589,7 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
{
- if ((!IS_LOCAL(source) || source != ServerInstance->FakeClient))
+ if ((!IS_LOCAL(source)) && (source != ServerInstance->FakeClient))
return;
CmdBuilder params(source, "KICK");
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 097f60fbb..4f72ed006 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -89,7 +89,7 @@ struct CapabData
*/
class TreeSocket : public BufferedSocket
{
- class BurstState;
+ struct BurstState;
std::string linkID; /* Description for this link */
ServerState LinkState; /* Link state */