Use CheckTimeStamp to merge modes on netburst

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11596 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 1 insertions, 2 deletions

diff --git a/include/modes/cmode_k.h b/include/modes/cmode_k.h
index 72dc125e8..671143be6 100644
--- a/include/modes/cmode_k.h
+++ b/include/modes/cmode_k.h
@@ -23,7 +23,6 @@ class ModeChannelKey : public ModeHandler
 	ModeChannelKey(InspIRCd* Instance);
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel);
 	void RemoveMode(Channel* channel, irc::modestacker* stack = NULL);
 	void RemoveMode(User* user, irc::modestacker* stack = NULL);
 };
diff --git a/include/modes/cmode_l.h b/include/modes/cmode_l.h
index 0dfe779e0..eba711095 100644
--- a/include/modes/cmode_l.h
+++ b/include/modes/cmode_l.h
@@ -23,5 +23,5 @@ class ModeChannelLimit : public ModeHandler
 	ModeChannelLimit(InspIRCd* Instance);
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel);
+	bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel* channel);
 };