From f6559895b25059655e2c215c3f1706182e4fa3c6 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 31 Jan 2022 02:22:14 +0000 Subject: Rename the ExtensionItem::type field to extype to avoid collisions. --- src/modules/m_spanningtree/metadata.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules/m_spanningtree/metadata.cpp') diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp index c4d3e55f4..9a21076f9 100644 --- a/src/modules/m_spanningtree/metadata.cpp +++ b/src/modules/m_spanningtree/metadata.cpp @@ -65,7 +65,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params) ExtensionItem* item = ServerInstance->Extensions.GetItem(params[5]); const std::string value = params.size() < 7 ? "" : params[6]; - if (item && item->type == ExtensionType::MEMBERSHIP) + if (item && item->extype == ExtensionType::MEMBERSHIP) item->FromNetwork(m, value); FOREACH_MOD(OnDecodeMetaData, (m, params[5], value)); } @@ -89,7 +89,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params) std::string value = params.size() < 4 ? "" : params[3]; ExtensionItem* item = ServerInstance->Extensions.GetItem(params[2]); - if ((item) && (item->type == ExtensionType::CHANNEL)) + if (item && item->extype == ExtensionType::CHANNEL) item->FromNetwork(c, value); FOREACH_MOD(OnDecodeMetaData, (c,params[2],value)); } @@ -101,7 +101,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params) ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]); std::string value = params.size() < 3 ? "" : params[2]; - if ((item) && (item->type == ExtensionType::USER)) + if (item && item->extype == ExtensionType::USER) item->FromNetwork(u, value); FOREACH_MOD(OnDecodeMetaData, (u,params[1],value)); } -- cgit v1.3.1-10-gc9f91