summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--louloulibs/network/socket_handler.hpp2
-rw-r--r--louloulibs/xmpp/body.hpp2
-rw-r--r--src/irc/irc_client.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/louloulibs/network/socket_handler.hpp b/louloulibs/network/socket_handler.hpp
index daa4413..feabcf1 100644
--- a/louloulibs/network/socket_handler.hpp
+++ b/louloulibs/network/socket_handler.hpp
@@ -6,7 +6,7 @@
class Poller;
-typedef int socket_t;
+using socket_t = int;
class SocketHandler
{
diff --git a/louloulibs/xmpp/body.hpp b/louloulibs/xmpp/body.hpp
index 6ac678e..df86feb 100644
--- a/louloulibs/xmpp/body.hpp
+++ b/louloulibs/xmpp/body.hpp
@@ -6,7 +6,7 @@ namespace Xmpp
// Contains:
// - an XMPP-valid UTF-8 body
// - an XML node representing the XHTML-IM body, or null
- typedef std::tuple<const std::string, std::unique_ptr<XmlNode>> body;
+ using body = std::tuple<const std::string, std::unique_ptr<XmlNode>>;
}
#endif /* XMPP_BODY_HPP_INCLUDED */
diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index 327b170..0b1b079 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -27,10 +27,10 @@ using namespace std::chrono_literals;
* Define a map of functions to be called for each IRC command we can
* handle.
*/
-typedef void (IrcClient::*irc_callback_t)(const IrcMessage&);
+using IrcCallback = void (IrcClient::*)(const IrcMessage&);
static const std::unordered_map<std::string,
- std::pair<irc_callback_t, std::pair<std::size_t, std::size_t>>> irc_callbacks = {
+ std::pair<IrcCallback, std::pair<std::size_t, std::size_t>>> irc_callbacks = {
{"NOTICE", {&IrcClient::on_notice, {2, 0}}},
{"002", {&IrcClient::forward_server_message, {2, 0}}},
{"003", {&IrcClient::forward_server_message, {2, 0}}},