summaryrefslogtreecommitdiff
path: root/include/mode.h
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-26 16:40:58 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-26 16:40:58 +0000
commitee913368d7162dbe0dd119091f8b468eb7be0f1a (patch)
tree16dadfee22e800beaa1d08668ed232700e2e9d2b /include/mode.h
parent553b17b542831cfe8063209f46326057f50a6fbd (diff)
Change IS_FAKE and CheckTimeStamp to IS_SERVER and ResolveModeConflict to clarify their use
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11765 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include/mode.h')
-rw-r--r--include/mode.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mode.h b/include/mode.h
index e118a161b..2c0e30be4 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -286,7 +286,7 @@ class CoreExport ModeHandler : public classbase
* @param channel The channel we are checking against
* @return True if the other side wins the merge, false if we win the merge for this mode.
*/
- virtual bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel* channel);
+ virtual bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel* channel);
/**
* When a remote server needs to bounce a set of modes, it will call this method for every mode