Mercurial > malikania

changeset 174:80b1638aa154

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Server: style
author David Demelier <markand@malikania.fr>
date Mon, 20 Aug 2018 13:25:18 +0200
parents 696453ebddcd
children a23758dda37d
files libserver/malikania/server/client.cpp libserver/malikania/server/client.hpp libserver/malikania/server/net/auth_handler.cpp libserver/malikania/server/net/auth_handler.hpp libserver/malikania/server/net/handler.hpp libserver/malikania/server/server.hpp
diffstat 6 files changed, 11 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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<client> clt, nlohmann::json object) noexcept
 {
@@ -54,6 +52,4 @@
 #endif
 }
 
-} // !server
-
-} // !mlk
+} // !mlk::server
--- 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<client> clt, nlohmann::json object) noexcept override;
 };
 
-} // !server
-
-} // !mlk
+} // !mlk::server
 
 #endif // !MALIKANIA_SERVER_AUTH_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 <json.hpp>
 
-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
--- 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> client, std::error_code code);
 };
 
-} // !server
-
 } // !mlk
 
 #endif // !MALIKANIA_SERVER_SERVER_HPP