diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-06-12 19:29:42 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-06-12 19:29:42 +0000 |
| commit | b3e3b1f14e12b4b0a395ef8e2a4848f132e2c22b (patch) | |
| tree | 18a4627fa652e12055acf88bfac758df0ad85d89 /src/modules | |
| parent | 06a25cab68a58a4c9e985a394590b3288de33723 (diff) | |
Now builds ok on gcc 4.3, not tested fully. Also UGLY, oh we hate you GCC, why couldnt you just use TR1 from the start???
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9894 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_messageflood.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/utils.h | 8 | ||||
| -rw-r--r-- | src/modules/m_stripcolor.cpp | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 166e252d6..83079c7f2 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -157,7 +157,7 @@ class MsgFlood : public ModeHandler } else { - if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban)) + if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0)))) { delete f; floodsettings *fs = new floodsettings(ban,nsecs,nlines); @@ -217,7 +217,7 @@ class ModuleMsgFlood : public Module int ProcessMessages(User* user,Channel* dest, const std::string &text) { - if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP) + if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)) { return 0; } diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h index db61fd7aa..27df8ddbf 100644 --- a/src/modules/m_spanningtree/utils.h +++ b/src/modules/m_spanningtree/utils.h @@ -26,9 +26,13 @@ class ModuleSpanningTree; * tree, used for rapid linear lookups. */ #ifdef WINDOWS -typedef nspace::hash_map<std::string, TreeServer*, nspace::hash_compare<std::string, std::less<std::string> > > server_hash; + typedef nspace::hash_map<std::string, TreeServer*, nspace::hash_compare<std::string, std::less<std::string> > > server_hash; #else -typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<std::string>, irc::StrHashComp> server_hash; + #ifdef HASHCOMP_DEPRECATED + typedef nspace::hash_map<std::string, TreeServer*, nspace::insensitive, irc::StrHashComp> server_hash; + #else + typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<std::string>, irc::StrHashComp> server_hash; + #endif #endif typedef std::map<TreeServer*,TreeServer*> TreeServerList; diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index 9fec3dcad..c3c274dff 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -68,7 +68,7 @@ class ModuleStripColor : public Module { if ((*i == 3)) seq = 1; - else if (seq && ( (*i >= '0') && (*i <= '9') || (*i == ',') ) ) + else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) )) { seq++; if ( (seq <= 4) && (*i == ',') ) |