From a5f7aac2953e94e49b93e9195ae8d4dccba46f6d Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 3 Jan 2022 16:50:06 +0000 Subject: Replace anope_{final,override} with their C++11 equivalent. --- include/access.h | 2 +- include/account.h | 4 ++-- include/extensible.h | 16 ++++++++-------- include/hashcomp.h | 8 ++++---- include/mail.h | 2 +- include/memo.h | 2 +- include/messages.h | 40 ++++++++++++++++++++-------------------- include/modes.h | 18 +++++++++--------- include/modules/dns.h | 2 +- include/modules/os_session.h | 2 +- include/modules/sasl.h | 4 ++-- include/modules/sql.h | 10 +++++----- include/regchannel.h | 4 ++-- include/service.h | 2 +- include/services.h | 8 -------- include/sockets.h | 18 +++++++++--------- include/uplink.h | 6 +++--- include/users.h | 2 +- include/xline.h | 2 +- 19 files changed, 72 insertions(+), 80 deletions(-) (limited to 'include') diff --git a/include/access.h b/include/access.h index fccf8220b..32b59e655 100644 --- a/include/access.h +++ b/include/access.h @@ -95,7 +95,7 @@ class CoreExport ChanAccess : public Serializable const Anope::string &Mask() const; NickCore *GetAccount() const; - void Serialize(Serialize::Data &data) const anope_override; + void Serialize(Serialize::Data &data) const override; static Serializable* Unserialize(Serializable *obj, Serialize::Data &); static const unsigned int MAX_DEPTH = 4; diff --git a/include/account.h b/include/account.h index 1a6809d90..163d7d0c6 100644 --- a/include/account.h +++ b/include/account.h @@ -54,7 +54,7 @@ class CoreExport NickAlias : public Serializable, public Extensible NickAlias(const Anope::string &nickname, NickCore *nickcore); ~NickAlias(); - void Serialize(Serialize::Data &data) const anope_override; + void Serialize(Serialize::Data &data) const override; static Serializable* Unserialize(Serializable *obj, Serialize::Data &); /** Set a vhost for the user @@ -149,7 +149,7 @@ class CoreExport NickCore : public Serializable, public Extensible NickCore(const Anope::string &nickdisplay, uint64_t nickid = 0); ~NickCore(); - void Serialize(Serialize::Data &data) const anope_override; + void Serialize(Serialize::Data &data) const override; static Serializable* Unserialize(Serializable *obj, Serialize::Data &); /** Changes the display for this account diff --git a/include/extensible.h b/include/extensible.h index 9b8bbd853..bb7f38448 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -93,7 +93,7 @@ class BaseExtensibleItem : public ExtensibleBase return t; } - void Unset(Extensible *obj) anope_override + void Unset(Extensible *obj) override { T *value = Get(obj); items.erase(obj); @@ -128,7 +128,7 @@ template class ExtensibleItem : public BaseExtensibleItem { protected: - T* Create(Extensible *obj) anope_override + T* Create(Extensible *obj) override { return new T(obj); } @@ -140,7 +140,7 @@ template class PrimitiveExtensibleItem : public BaseExtensibleItem { protected: - T* Create(Extensible *obj) anope_override + T* Create(Extensible *obj) override { return new T(); } @@ -152,7 +152,7 @@ template<> class PrimitiveExtensibleItem : public BaseExtensibleItem { protected: - bool* Create(Extensible *) anope_override + bool* Create(Extensible *) override { return NULL; } @@ -166,13 +166,13 @@ class SerializableExtensibleItem : public PrimitiveExtensibleItem public: SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem(m, n) { } - void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override + void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override { T* t = this->Get(e); data[this->name] << *t; } - void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) anope_override + void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) override { T t; if (data[this->name] >> t) @@ -188,12 +188,12 @@ class SerializableExtensibleItem : public PrimitiveExtensibleItem public: SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem(m, n) { } - void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override + void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override { data[this->name] << true; } - void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) anope_override + void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) override { bool b = false; data[this->name] >> b; diff --git a/include/hashcomp.h b/include/hashcomp.h index 983115620..a50ab334d 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -38,7 +38,7 @@ namespace Anope class ascii_ctype : public std::ctype { public: - char_type do_toupper(char_type c) const anope_override + char_type do_toupper(char_type c) const override { if (c >= 'a' && c <= 'z') return c - 32; @@ -46,7 +46,7 @@ namespace Anope return c; } - char_type do_tolower(char_type c) const anope_override + char_type do_tolower(char_type c) const override { if (c >= 'A' && c <= 'Z') return c + 32; @@ -60,7 +60,7 @@ namespace Anope class rfc1459_ctype : public ascii_ctype { public: - char_type do_toupper(char_type c) const anope_override + char_type do_toupper(char_type c) const override { if (c == '{' || c == '}' || c == '|') return c - 32; @@ -68,7 +68,7 @@ namespace Anope return ascii_ctype::do_toupper(c); } - char_type do_tolower(char_type c) const anope_override + char_type do_tolower(char_type c) const override { if (c == '[' || c == ']' || c == '\\') return c + 32; diff --git a/include/mail.h b/include/mail.h index e46848ded..932d1a6e6 100644 --- a/include/mail.h +++ b/include/mail.h @@ -48,7 +48,7 @@ namespace Mail ~Message(); /* Called from within the thread to actually send the mail */ - void Run() anope_override; + void Run() override; }; } // namespace Mail diff --git a/include/memo.h b/include/memo.h index 277f70da6..112fd3c21 100644 --- a/include/memo.h +++ b/include/memo.h @@ -24,7 +24,7 @@ class CoreExport Memo : public Serializable Memo(); ~Memo(); - void Serialize(Serialize::Data &data) const anope_override; + void Serialize(Serialize::Data &data) const override; static Serializable* Unserialize(Serializable *obj, Serialize::Data &); Anope::string owner; diff --git a/include/messages.h b/include/messages.h index bdd3fa944..3e8be52fd 100644 --- a/include/messages.h +++ b/include/messages.h @@ -23,35 +23,35 @@ namespace Message { Away(Module *creator, const Anope::string &mname = "AWAY") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Capab : IRCDMessage { Capab(Module *creator, const Anope::string &mname = "CAPAB") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Error : IRCDMessage { Error(Module *creator, const Anope::string &mname = "ERROR") : IRCDMessage(creator, mname, 1) { } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Invite : IRCDMessage { Invite(Module *creator, const Anope::string &mname = "INVITE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Join : IRCDMessage { Join(Module *creator, const Anope::string &mname = "JOIN") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; typedef std::pair SJoinUser; @@ -69,105 +69,105 @@ namespace Message { Kick(Module *creator, const Anope::string &mname = "KICK") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Kill : IRCDMessage { Kill(Module *creator, const Anope::string &mname = "KILL") : IRCDMessage(creator, mname, 2) { } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Mode : IRCDMessage { Mode(Module *creator, const Anope::string &mname = "MODE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport MOTD : IRCDMessage { MOTD(Module *creator, const Anope::string &mname = "MOTD") : IRCDMessage(creator, mname, 1) { } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Notice : IRCDMessage { Notice(Module *creator, const Anope::string &mname = "NOTICE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Part : IRCDMessage { Part(Module *creator, const Anope::string &mname = "PART") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Ping : IRCDMessage { Ping(Module *creator, const Anope::string &mname = "PING") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Privmsg : IRCDMessage { Privmsg(Module *creator, const Anope::string &mname = "PRIVMSG") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Quit : IRCDMessage { Quit(Module *creator, const Anope::string &mname = "QUIT") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport SQuit : IRCDMessage { SQuit(Module *creator, const Anope::string &mname = "SQUIT") : IRCDMessage(creator, mname, 2) { } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Stats : IRCDMessage { Stats(Module *creator, const Anope::string &mname = "STATS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Time : IRCDMessage { Time(Module *creator, const Anope::string &mname = "TIME") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Topic : IRCDMessage { Topic(Module *creator, const Anope::string &mname = "TOPIC") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Version : IRCDMessage { Version(Module *creator, const Anope::string &mname = "VERSION") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; struct CoreExport Whois : IRCDMessage { Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); } - void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) anope_override; + void Run(MessageSource &source, const std::vector ¶ms, const Anope::map &tags) override; }; } // namespace Message diff --git a/include/modes.h b/include/modes.h index 04fc97791..cbde11429 100644 --- a/include/modes.h +++ b/include/modes.h @@ -105,7 +105,7 @@ class CoreExport ChannelMode : public Mode */ ChannelMode(const Anope::string &name, char mc); - bool CanSet(User *u) const anope_override; + bool CanSet(User *u) const override; virtual void Check() { } @@ -217,11 +217,11 @@ class CoreExport ChannelModeVirtual : public T ~ChannelModeVirtual(); - void Check() anope_override; + void Check() override; - ChannelMode *Wrap(Anope::string ¶m) anope_override; + ChannelMode *Wrap(Anope::string ¶m) override; - ChannelMode *Unwrap(ChannelMode *cm, Anope::string ¶m) anope_override = 0; + ChannelMode *Unwrap(ChannelMode *cm, Anope::string ¶m) override = 0; }; /* The status a user has on a channel (+v, +h, +o) etc */ @@ -245,7 +245,7 @@ class CoreExport UserModeOperOnly : public UserMode public: UserModeOperOnly(const Anope::string &mname, char um) : UserMode(mname, um) { } - bool CanSet(User *u) const anope_override; + bool CanSet(User *u) const override; }; class CoreExport UserModeNoone : public UserMode @@ -253,7 +253,7 @@ class CoreExport UserModeNoone : public UserMode public: UserModeNoone(const Anope::string &mname, char um) : UserMode(mname, um) { } - bool CanSet(User *u) const anope_override; + bool CanSet(User *u) const override; }; /** Channel mode +k (key) @@ -263,7 +263,7 @@ class CoreExport ChannelModeKey : public ChannelModeParam public: ChannelModeKey(char mc) : ChannelModeParam("KEY", mc) { } - bool IsValid(Anope::string &value) const anope_override; + bool IsValid(Anope::string &value) const override; }; /** This class is used for oper only channel modes @@ -274,7 +274,7 @@ class CoreExport ChannelModeOperOnly : public ChannelMode ChannelModeOperOnly(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { } /* Opers only */ - bool CanSet(User *u) const anope_override; + bool CanSet(User *u) const override; }; /** This class is used for channel modes only servers may set @@ -284,7 +284,7 @@ class CoreExport ChannelModeNoone : public ChannelMode public: ChannelModeNoone(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { } - bool CanSet(User *u) const anope_override; + bool CanSet(User *u) const override; }; /** This is the mode manager diff --git a/include/modules/dns.h b/include/modules/dns.h index 3b90fad7a..1fe642c3b 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -164,7 +164,7 @@ namespace DNS /** Used to time out the query, xalls OnError and lets the TimerManager * delete this request. */ - void Tick(time_t) anope_override + void Tick(time_t) override { Log(LOG_DEBUG_2) << "Resolver: timeout for query " << this->name; Query rr(*this); diff --git a/include/modules/os_session.h b/include/modules/os_session.h index b8a889b8e..0dd2cdcb4 100644 --- a/include/modules/os_session.h +++ b/include/modules/os_session.h @@ -28,7 +28,7 @@ struct Exception : Serializable time_t expires; /* Time when it expires. 0 == no expiry */ Exception() : Serializable("Exception") { } - void Serialize(Serialize::Data &data) const anope_override; + void Serialize(Serialize::Data &data) const override; static Serializable* Unserialize(Serializable *obj, Serialize::Data &data); }; diff --git a/include/modules/sasl.h b/include/modules/sasl.h index bd6cfdb31..3b2d587fa 100644 --- a/include/modules/sasl.h +++ b/include/modules/sasl.h @@ -82,7 +82,7 @@ namespace SASL public: IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass, const Anope::string &h, const Anope::string &i) : ::IdentifyRequest(m, acc, pass), uid(id), hostname(h), ip(i) { } - void OnSuccess() anope_override + void OnSuccess() override { if (!sasl) return; @@ -108,7 +108,7 @@ namespace SASL } } - void OnFail() anope_override + void OnFail() override { if (!sasl) return; diff --git a/include/modules/sql.h b/include/modules/sql.h index e2e01e20e..0be5e93d0 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -21,7 +21,7 @@ namespace SQL Clear(); } - std::iostream& operator[](const Anope::string &key) anope_override + std::iostream& operator[](const Anope::string &key) override { std::stringstream *&ss = data[key]; if (!ss) @@ -29,7 +29,7 @@ namespace SQL return *ss; } - std::set KeySet() const anope_override + std::set KeySet() const override { std::set keys; for (Map::const_iterator it = this->data.begin(), it_end = this->data.end(); it != it_end; ++it) @@ -37,7 +37,7 @@ namespace SQL return keys; } - size_t Hash() const anope_override + size_t Hash() const override { size_t hash = 0; for (Map::const_iterator it = this->data.begin(), it_end = this->data.end(); it != it_end; ++it) @@ -61,12 +61,12 @@ namespace SQL this->data.clear(); } - void SetType(const Anope::string &key, Type t) anope_override + void SetType(const Anope::string &key, Type t) override { this->types[key] = t; } - Type GetType(const Anope::string &key) const anope_override + Type GetType(const Anope::string &key) const override { std::map::const_iterator it = this->types.find(key); if (it != this->types.end()) diff --git a/include/regchannel.h b/include/regchannel.h index d0f0bf02f..bf14d82ae 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -38,7 +38,7 @@ class CoreExport AutoKick : public Serializable AutoKick(); ~AutoKick(); - void Serialize(Serialize::Data &data) const anope_override; + void Serialize(Serialize::Data &data) const override; static Serializable* Unserialize(Serializable *obj, Serialize::Data &); }; @@ -94,7 +94,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible ~ChannelInfo(); - void Serialize(Serialize::Data &data) const anope_override; + void Serialize(Serialize::Data &data) const override; static Serializable* Unserialize(Serializable *obj, Serialize::Data &); /** Change the founder of the channel diff --git a/include/service.h b/include/service.h index 2f7618371..1aa4034df 100644 --- a/include/service.h +++ b/include/service.h @@ -134,7 +134,7 @@ class ServiceReference : public Reference this->invalid = true; } - operator bool() anope_override + operator bool() override { if (this->invalid) { diff --git a/include/services.h b/include/services.h index 8a9551155..8fb7a0108 100644 --- a/include/services.h +++ b/include/services.h @@ -48,14 +48,6 @@ #define _(x) x -#if defined __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L -# define anope_override override -# define anope_final final -#else -# define anope_override -# define anope_final -#endif - #ifndef _WIN32 # define DllExport # define CoreExport diff --git a/include/sockets.h b/include/sockets.h index 1a54e4fd1..aed9957b6 100644 --- a/include/sockets.h +++ b/include/sockets.h @@ -291,12 +291,12 @@ class CoreExport BufferedSocket : public virtual Socket /** Called when there is something to be received for this socket * @return true on success, false to drop this socket */ - bool ProcessRead() anope_override; + bool ProcessRead() override; /** Called when the socket is ready to be written to * @return true on success, false to drop this socket */ - bool ProcessWrite() anope_override; + bool ProcessWrite() override; /** Gets the new line from the input buffer, if any */ @@ -345,12 +345,12 @@ class CoreExport BinarySocket : public virtual Socket /** Called when there is something to be received for this socket * @return true on success, false to drop this socket */ - bool ProcessRead() anope_override; + bool ProcessRead() override; /** Called when the socket is ready to be written to * @return true on success, false to drop this socket */ - bool ProcessWrite() anope_override; + bool ProcessWrite() override; /** Write data to the socket * @param buffer The data to write @@ -408,12 +408,12 @@ class CoreExport ConnectionSocket : public virtual Socket * Used to determine whether or not this socket is connected yet. * @return true to continue to call ProcessRead/ProcessWrite, false to not continue */ - bool Process() anope_override; + bool Process() override; /** Called when there is an error for this socket * @return true on success, false to drop this socket */ - void ProcessError() anope_override; + void ProcessError() override; /** Called on a successful connect */ @@ -443,12 +443,12 @@ class CoreExport ClientSocket : public virtual Socket * Used to determine whether or not this socket is connected yet. * @return true to continue to call ProcessRead/ProcessWrite, false to not continue */ - bool Process() anope_override; + bool Process() override; /** Called when there is an error for this socket * @return true on success, false to drop this socket */ - void ProcessError() anope_override; + void ProcessError() override; /** Called when a client has been accepted() successfully. */ @@ -472,7 +472,7 @@ class CoreExport Pipe : public Socket /** Called when data is to be read, reads the data then calls OnNotify */ - bool ProcessRead() anope_override; + bool ProcessRead() override; /** Write data to this pipe * @param data The data to write diff --git a/include/uplink.h b/include/uplink.h index 6d3089137..5aac5dd2d 100644 --- a/include/uplink.h +++ b/include/uplink.h @@ -27,9 +27,9 @@ class UplinkSocket : public ConnectionSocket, public BufferedSocket bool error; UplinkSocket(); ~UplinkSocket(); - bool ProcessRead() anope_override; - void OnConnect() anope_override; - void OnError(const Anope::string &) anope_override; + bool ProcessRead() override; + void OnConnect() override; + void OnError(const Anope::string &) override; /* A message sent over the uplink socket */ class CoreExport Message diff --git a/include/users.h b/include/users.h index c96cc8145..e9bef1c4a 100644 --- a/include/users.h +++ b/include/users.h @@ -190,7 +190,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe * @param ... any number of parameters */ void SendMessage(BotInfo *source, const char *fmt, ...); - void SendMessage(BotInfo *source, const Anope::string &msg) anope_override; + void SendMessage(BotInfo *source, const Anope::string &msg) override; /** Identify the user to a nick. * updates last_seen, logs the user in, diff --git a/include/xline.h b/include/xline.h index 413dc3340..1b032ded9 100644 --- a/include/xline.h +++ b/include/xline.h @@ -44,7 +44,7 @@ class CoreExport XLine : public Serializable bool HasNickOrReal() const; bool IsRegex() const; - void Serialize(Serialize::Data &data) const anope_override; + void Serialize(Serialize::Data &data) const override; static Serializable* Unserialize(Serializable *obj, Serialize::Data &data); }; -- cgit