# HG changeset patch # User David Demelier # Date 1534764318 -7200 # Node ID 80b1638aa154b3ba2e167a1a7c5b9be622c8ce21 # Parent 696453ebddcd9b4d82fd0d1b0151e5b504fa3385 Server: style diff -r 696453ebddcd -r 80b1638aa154 libserver/malikania/server/client.cpp --- a/libserver/malikania/server/client.cpp Mon Aug 20 13:24:39 2018 +0200 +++ b/libserver/malikania/server/client.cpp Mon Aug 20 13:25:18 2018 +0200 @@ -22,9 +22,7 @@ #include "client.hpp" #include "server.hpp" -namespace mlk { - -namespace server { +namespace mlk::server { void client::handle_read(boost::system::error_code code, std::size_t xfer) { @@ -162,6 +160,4 @@ state_ = state::closing; } -} // !server - -} // !mlk +} // !mlk::server diff -r 696453ebddcd -r 80b1638aa154 libserver/malikania/server/client.hpp --- a/libserver/malikania/server/client.hpp Mon Aug 20 13:24:39 2018 +0200 +++ b/libserver/malikania/server/client.hpp Mon Aug 20 13:25:18 2018 +0200 @@ -37,9 +37,7 @@ #include "db/account.hpp" -namespace mlk { - -namespace server { +namespace mlk::server { class server; @@ -172,8 +170,6 @@ void fatal(std::string cmd, nlohmann::json args); }; -} // !server - -} // !mlk +} // !mlk::server #endif // !MALIKANIA_SERVER_CLIENT_HPP diff -r 696453ebddcd -r 80b1638aa154 libserver/malikania/server/net/auth_handler.cpp --- a/libserver/malikania/server/net/auth_handler.cpp Mon Aug 20 13:24:39 2018 +0200 +++ b/libserver/malikania/server/net/auth_handler.cpp Mon Aug 20 13:25:18 2018 +0200 @@ -25,9 +25,7 @@ #include "client.hpp" #include "server.hpp" -namespace mlk { - -namespace server { +namespace mlk::server { void auth_handler::exec(server& server, std::shared_ptr clt, nlohmann::json object) noexcept { @@ -54,6 +52,4 @@ #endif } -} // !server - -} // !mlk +} // !mlk::server diff -r 696453ebddcd -r 80b1638aa154 libserver/malikania/server/net/auth_handler.hpp --- a/libserver/malikania/server/net/auth_handler.hpp Mon Aug 20 13:24:39 2018 +0200 +++ b/libserver/malikania/server/net/auth_handler.hpp Mon Aug 20 13:25:18 2018 +0200 @@ -26,9 +26,7 @@ #include "handler.hpp" -namespace mlk { - -namespace server { +namespace mlk::server { /** * \brief Handle "auth" network command. @@ -41,8 +39,6 @@ void exec(server &server, std::shared_ptr clt, nlohmann::json object) noexcept override; }; -} // !server - -} // !mlk +} // !mlk::server #endif // !MALIKANIA_SERVER_AUTH_HANDLER_HPP diff -r 696453ebddcd -r 80b1638aa154 libserver/malikania/server/net/handler.hpp --- a/libserver/malikania/server/net/handler.hpp Mon Aug 20 13:24:39 2018 +0200 +++ b/libserver/malikania/server/net/handler.hpp Mon Aug 20 13:25:18 2018 +0200 @@ -28,9 +28,7 @@ #include -namespace mlk { - -namespace server { +namespace mlk::server { class server; class client; @@ -62,8 +60,6 @@ nlohmann::json message) noexcept = 0; }; -} // !server - -} // !mlk +} // !mlk::server #endif // !MALIKANIA_SERVER_HANDLER_HPP diff -r 696453ebddcd -r 80b1638aa154 libserver/malikania/server/server.hpp --- a/libserver/malikania/server/server.hpp Mon Aug 20 13:24:39 2018 +0200 +++ b/libserver/malikania/server/server.hpp Mon Aug 20 13:25:18 2018 +0200 @@ -38,9 +38,7 @@ #include "net/handler.hpp" -namespace mlk { - -namespace server { +namespace mlk::server { class client; class database; @@ -118,8 +116,6 @@ virtual void handle_accept(std::shared_ptr client, std::error_code code); }; -} // !server - } // !mlk #endif // !MALIKANIA_SERVER_SERVER_HPP