diff options
| author |  Sadie Powell | 2024-09-13 12:11:11 +0100 |
|---|---|---|
| committer | Sadie Powell | 2024-09-13 12:11:11 +0100 |
| commit | a6ea949d4dbd7ab1ea972919ef7d8db312d31f6c (patch) | |
| tree | 842d0275cd6c1d0003a28826da16cf02a89f2ed1 /src | |
| parent | Only remove extbans on unload if provided by the right module. (diff) | |
Use reference<>::ptr() in more places.
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/extra/m_mysql.cpp | 2 | ||||
| -rw-r--r-- | src/modules/extra/m_pgsql.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/rconnect.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/servercommand.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index aaf87f076..ae6a27a9d 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -395,7 +395,7 @@ public: ModuleSQL* Parent() { - return (ModuleSQL*)(Module*)creator; + return static_cast<ModuleSQL*>(creator.ptr()); } MySQLresult* DoBlockingQuery(const std::string& query) diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 63074fef3..e4e656771 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -677,7 +677,7 @@ bool ReconnectTimer::Tick() void SQLConn::DelayReconnect() { status = DEAD; - ModulePgSQL* mod = (ModulePgSQL*)(Module*)creator; + auto* mod = static_cast<ModulePgSQL*>(creator.ptr()); ConnMap::iterator it = mod->connections.find(conf->getString("id")); if (it != mod->connections.end()) diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp index b22527708..1e941b2d9 100644 --- a/src/modules/m_spanningtree/rconnect.cpp +++ b/src/modules/m_spanningtree/rconnect.cpp @@ -52,9 +52,10 @@ CmdResult CommandRConnect::Handle(User* user, const Params& parameters) /* Yes, initiate the given connect */ ServerInstance->SNO.WriteToSnoMask('l', "Remote CONNECT from {} matching \002{}\002, connecting server \002{}\002", user->nick, parameters[0], parameters[1]); + CommandBase::Params para; para.push_back(parameters[1]); - ((ModuleSpanningTree*)(Module*)creator)->HandleConnect(para, user); + static_cast<ModuleSpanningTree*>(creator.ptr())->HandleConnect(para, user); } else { diff --git a/src/modules/m_spanningtree/servercommand.cpp b/src/modules/m_spanningtree/servercommand.cpp index 62256ed31..6ccbafa00 100644 --- a/src/modules/m_spanningtree/servercommand.cpp +++ b/src/modules/m_spanningtree/servercommand.cpp @@ -29,7 +29,7 @@ ServerCommand::ServerCommand(Module* Creator, const std::string& Name, unsigned void ServerCommand::RegisterService() { - ModuleSpanningTree* st = static_cast<ModuleSpanningTree*>(static_cast<Module*>(creator)); + auto* st = static_cast<ModuleSpanningTree*>(creator.ptr()); st->CmdManager.AddCommand(this); } |