From f0bc6c83a8eb548d0a3edbf7c16a6922bfd24ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Wed, 8 Mar 2017 19:04:15 +0100 Subject: Pass the shared_ptr by reference, to avoid useless copies --- louloulibs/network/dns_handler.cpp | 2 +- louloulibs/network/dns_handler.hpp | 2 +- louloulibs/network/dns_socket_handler.cpp | 2 +- louloulibs/network/dns_socket_handler.hpp | 2 +- louloulibs/network/socket_handler.hpp | 2 +- louloulibs/network/tcp_client_socket_handler.cpp | 2 +- louloulibs/network/tcp_client_socket_handler.hpp | 2 +- louloulibs/network/tcp_server_socket.hpp | 2 +- louloulibs/network/tcp_socket_handler.cpp | 2 +- louloulibs/network/tcp_socket_handler.hpp | 2 +- louloulibs/xmpp/xmpp_component.cpp | 2 +- louloulibs/xmpp/xmpp_component.hpp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'louloulibs') diff --git a/louloulibs/network/dns_handler.cpp b/louloulibs/network/dns_handler.cpp index fbd2763..641c087 100644 --- a/louloulibs/network/dns_handler.cpp +++ b/louloulibs/network/dns_handler.cpp @@ -17,7 +17,7 @@ using namespace std::string_literals; std::unique_ptr DNSHandler::socket_handler{}; -DNSHandler::DNSHandler(std::shared_ptr poller) +DNSHandler::DNSHandler(std::shared_ptr& poller) { dns_init(nullptr, 0); const auto socket = dns_open(nullptr); diff --git a/louloulibs/network/dns_handler.hpp b/louloulibs/network/dns_handler.hpp index 78ffe4d..416f85f 100644 --- a/louloulibs/network/dns_handler.hpp +++ b/louloulibs/network/dns_handler.hpp @@ -14,7 +14,7 @@ class Poller; class DNSHandler { public: - explicit DNSHandler(std::shared_ptr poller); + explicit DNSHandler(std::shared_ptr& poller); ~DNSHandler() = default; DNSHandler(const DNSHandler&) = delete; diff --git a/louloulibs/network/dns_socket_handler.cpp b/louloulibs/network/dns_socket_handler.cpp index ad744a9..84e5625 100644 --- a/louloulibs/network/dns_socket_handler.cpp +++ b/louloulibs/network/dns_socket_handler.cpp @@ -7,7 +7,7 @@ #include -DNSSocketHandler::DNSSocketHandler(std::shared_ptr poller, +DNSSocketHandler::DNSSocketHandler(std::shared_ptr& poller, const socket_t socket): SocketHandler(poller, socket) { diff --git a/louloulibs/network/dns_socket_handler.hpp b/louloulibs/network/dns_socket_handler.hpp index e12f145..fc5f41f 100644 --- a/louloulibs/network/dns_socket_handler.hpp +++ b/louloulibs/network/dns_socket_handler.hpp @@ -12,7 +12,7 @@ class DNSSocketHandler: public SocketHandler { public: - explicit DNSSocketHandler(std::shared_ptr poller, const socket_t socket); + explicit DNSSocketHandler(std::shared_ptr& poller, const socket_t socket); ~DNSSocketHandler(); DNSSocketHandler(const DNSSocketHandler&) = delete; DNSSocketHandler(DNSSocketHandler&&) = delete; diff --git a/louloulibs/network/socket_handler.hpp b/louloulibs/network/socket_handler.hpp index 607a106..6a7220e 100644 --- a/louloulibs/network/socket_handler.hpp +++ b/louloulibs/network/socket_handler.hpp @@ -10,7 +10,7 @@ using socket_t = int; class SocketHandler { public: - explicit SocketHandler(std::shared_ptr poller, const socket_t socket): + explicit SocketHandler(std::shared_ptr& poller, const socket_t socket): poller(poller), socket(socket) {} diff --git a/louloulibs/network/tcp_client_socket_handler.cpp b/louloulibs/network/tcp_client_socket_handler.cpp index 530c3d9..4628703 100644 --- a/louloulibs/network/tcp_client_socket_handler.cpp +++ b/louloulibs/network/tcp_client_socket_handler.cpp @@ -11,7 +11,7 @@ using namespace std::string_literals; -TCPClientSocketHandler::TCPClientSocketHandler(std::shared_ptr poller): +TCPClientSocketHandler::TCPClientSocketHandler(std::shared_ptr& poller): TCPSocketHandler(poller), hostname_resolution_failed(false), connected(false), diff --git a/louloulibs/network/tcp_client_socket_handler.hpp b/louloulibs/network/tcp_client_socket_handler.hpp index 75e1364..74caca9 100644 --- a/louloulibs/network/tcp_client_socket_handler.hpp +++ b/louloulibs/network/tcp_client_socket_handler.hpp @@ -5,7 +5,7 @@ class TCPClientSocketHandler: public TCPSocketHandler { public: - TCPClientSocketHandler(std::shared_ptr poller); + TCPClientSocketHandler(std::shared_ptr& poller); ~TCPClientSocketHandler(); /** * Connect to the remote server, and call on_connected() if this diff --git a/louloulibs/network/tcp_server_socket.hpp b/louloulibs/network/tcp_server_socket.hpp index 7ea49ab..c511962 100644 --- a/louloulibs/network/tcp_server_socket.hpp +++ b/louloulibs/network/tcp_server_socket.hpp @@ -18,7 +18,7 @@ template class TcpSocketServer: public SocketHandler { public: - TcpSocketServer(std::shared_ptr poller, const uint16_t port): + TcpSocketServer(std::shared_ptr& poller, const uint16_t port): SocketHandler(poller, -1) { if ((this->socket = ::socket(AF_INET6, SOCK_STREAM, 0)) == -1) diff --git a/louloulibs/network/tcp_socket_handler.cpp b/louloulibs/network/tcp_socket_handler.cpp index 6aef2b1..7eebae0 100644 --- a/louloulibs/network/tcp_socket_handler.cpp +++ b/louloulibs/network/tcp_socket_handler.cpp @@ -44,7 +44,7 @@ using namespace std::chrono_literals; namespace ph = std::placeholders; -TCPSocketHandler::TCPSocketHandler(std::shared_ptr poller): +TCPSocketHandler::TCPSocketHandler(std::shared_ptr& poller): SocketHandler(poller, -1), use_tls(false) #ifdef BOTAN_FOUND diff --git a/louloulibs/network/tcp_socket_handler.hpp b/louloulibs/network/tcp_socket_handler.hpp index 600405d..3ee2f47 100644 --- a/louloulibs/network/tcp_socket_handler.hpp +++ b/louloulibs/network/tcp_socket_handler.hpp @@ -60,7 +60,7 @@ class TCPSocketHandler: public SocketHandler protected: ~TCPSocketHandler(); public: - explicit TCPSocketHandler(std::shared_ptr poller); + explicit TCPSocketHandler(std::shared_ptr& poller); TCPSocketHandler(const TCPSocketHandler&) = delete; TCPSocketHandler(TCPSocketHandler&&) = delete; TCPSocketHandler& operator=(const TCPSocketHandler&) = delete; diff --git a/louloulibs/xmpp/xmpp_component.cpp b/louloulibs/xmpp/xmpp_component.cpp index e40b1e4..5d98e58 100644 --- a/louloulibs/xmpp/xmpp_component.cpp +++ b/louloulibs/xmpp/xmpp_component.cpp @@ -39,7 +39,7 @@ static std::set kickable_errors{ "malformed-error" }; -XmppComponent::XmppComponent(std::shared_ptr poller, const std::string& hostname, const std::string& secret): +XmppComponent::XmppComponent(std::shared_ptr& poller, const std::string& hostname, const std::string& secret): TCPClientSocketHandler(poller), ever_auth(false), first_connection_try(true), diff --git a/louloulibs/xmpp/xmpp_component.hpp b/louloulibs/xmpp/xmpp_component.hpp index a9bac0f..16d7480 100644 --- a/louloulibs/xmpp/xmpp_component.hpp +++ b/louloulibs/xmpp/xmpp_component.hpp @@ -43,7 +43,7 @@ class XmppComponent: public TCPClientSocketHandler { public: - explicit XmppComponent(std::shared_ptr poller, const std::string& hostname, const std::string& secret); + explicit XmppComponent(std::shared_ptr& poller, const std::string& hostname, const std::string& secret); virtual ~XmppComponent() = default; XmppComponent(const XmppComponent&) = delete; -- cgit v1.2.3