From c78ecdf579c0bf0a75ed0f9641ffef8d89c17ec8 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 25 Jan 2019 02:52:11 +0000 Subject: Replace the override macro with the override keyword. --- src/modules/m_ldapoper.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/modules/m_ldapoper.cpp') diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp index cde5b00d7..27b2ca347 100644 --- a/src/modules/m_ldapoper.cpp +++ b/src/modules/m_ldapoper.cpp @@ -65,7 +65,7 @@ class LDAPOperBase : public LDAPInterface { } - void OnError(const LDAPResult& err) CXX11_OVERRIDE + void OnError(const LDAPResult& err) override { ServerInstance->SNO->WriteToSnoMask('a', "Error searching LDAP server: %s", err.getError().c_str()); Fallback(); @@ -81,7 +81,7 @@ class BindInterface : public LDAPOperBase { } - void OnResult(const LDAPResult& r) CXX11_OVERRIDE + void OnResult(const LDAPResult& r) override { User* user = ServerInstance->FindUUID(uid); ServerConfig::OperIndex::const_iterator iter = ServerInstance->Config->oper_blocks.find(opername); @@ -133,7 +133,7 @@ class SearchInterface : public LDAPOperBase { } - void OnResult(const LDAPResult& result) CXX11_OVERRIDE + void OnResult(const LDAPResult& result) override { if (!HandleResult(result)) Fallback(); @@ -156,7 +156,7 @@ class AdminBindInterface : public LDAPInterface { } - void OnResult(const LDAPResult& r) CXX11_OVERRIDE + void OnResult(const LDAPResult& r) override { dynamic_reference LDAP(me, provider); if (LDAP) @@ -173,7 +173,7 @@ class AdminBindInterface : public LDAPInterface delete this; } - void OnError(const LDAPResult& err) CXX11_OVERRIDE + void OnError(const LDAPResult& err) override { ServerInstance->SNO->WriteToSnoMask('a', "Error binding as manager to LDAP server: " + err.getError()); delete this; @@ -193,7 +193,7 @@ class ModuleLDAPAuth : public Module me = this; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("ldapoper"); @@ -202,7 +202,7 @@ class ModuleLDAPAuth : public Module attribute = tag->getString("attribute"); } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { if (validated && command == "OPER" && parameters.size() >= 2) { @@ -240,7 +240,7 @@ class ModuleLDAPAuth : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Adds the ability to authenticate opers via LDAP", VF_VENDOR); } -- cgit v1.3.1-10-gc9f91