mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Replace a useless shared_ptr by a unique_ptr"

Browse Source 
This reverts commit 248e25c22f.

In preparation for the botan 3 update `IrcClient` must be made into a
`shared_ptr`, which will then allow us to pass a `shared_ptr` of
callbacks to `Botan::TLS::Client`
This commit is contained in:
Luca Matei Pintilie
2025-07-29 15:52:16 +02:00
parent 40adab8b56
commit 8c4769e27b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.cpp
+5 -5
View File
@@ -63,7 +63,7 @@ void Bridge::shutdown(const std::string& exit_message)
{ {
for (auto& pair: this->irc_clients) for (auto& pair: this->irc_clients)
{ {
std::unique_ptr<IrcClient>& irc = pair.second; std::shared_ptr<IrcClient>& irc = pair.second;
irc->send_quit_command(exit_message); irc->send_quit_command(exit_message);
} }
} }
@@ -134,11 +134,11 @@ IrcClient* Bridge::make_irc_client(const std::string& hostname, const std::strin
realname = this->get_bare_jid(); realname = this->get_bare_jid();
} }
this->irc_clients.emplace(hostname, this->irc_clients.emplace(hostname,
std::make_unique<IrcClient>(this->poller, hostname, std::make_shared<IrcClient>(this->poller, hostname,
nickname, username, nickname, username,
realname, jid.domain, realname, jid.domain,
*this)); *this));
std::unique_ptr<IrcClient>& irc = this->irc_clients.at(hostname); std::shared_ptr<IrcClient> irc = this->irc_clients.at(hostname);
return irc.get(); return irc.get();
} }
} }
@@ -1146,12 +1146,12 @@ void Bridge::trigger_on_irc_message(const std::string& irc_hostname, const IrcMe
} }
} }
std::unordered_map<std::string, std::unique_ptr<IrcClient>>& Bridge::get_irc_clients() std::unordered_map<std::string, std::shared_ptr<IrcClient>>& Bridge::get_irc_clients()
{ {
return this->irc_clients; return this->irc_clients;
} }
const std::unordered_map<std::string, std::unique_ptr<IrcClient>>& Bridge::get_irc_clients() const const std::unordered_map<std::string, std::shared_ptr<IrcClient>>& Bridge::get_irc_clients() const
{ {
return this->irc_clients; return this->irc_clients;
} }
src/bridge/bridge.hpp
+3 -3
View File
@@ -226,8 +226,8 @@ public:
* iq_responder_callback_t and remove the callback from the list. * iq_responder_callback_t and remove the callback from the list.
*/ */
void trigger_on_irc_message(const std::string& irc_hostname, const IrcMessage& message); void trigger_on_irc_message(const std::string& irc_hostname, const IrcMessage& message);
std::unordered_map<std::string, std::unique_ptr<IrcClient>>& get_irc_clients(); std::unordered_map<std::string, std::shared_ptr<IrcClient>>& get_irc_clients();
const std::unordered_map<std::string, std::unique_ptr<IrcClient>>& get_irc_clients() const; const std::unordered_map<std::string, std::shared_ptr<IrcClient>>& get_irc_clients() const;
std::set<char> get_chantypes(const std::string& hostname) const; std::set<char> get_chantypes(const std::string& hostname) const;
#ifdef USE_DATABASE #ifdef USE_DATABASE
void set_record_history(const bool val); void set_record_history(const bool val);
@@ -260,7 +260,7 @@ private:
* One IrcClient for each IRC server we need to be connected to. * One IrcClient for each IRC server we need to be connected to.
* The pointer is shared by the bridge and the poller. * The pointer is shared by the bridge and the poller.
*/ */
std::unordered_map<std::string, std::unique_ptr<IrcClient>> irc_clients; std::unordered_map<std::string, std::shared_ptr<IrcClient>> irc_clients;
/** /**
* To communicate back with the XMPP component * To communicate back with the XMPP component
*/ */