From 92d00256dab3838c32131db0a7aa51b66cc49150 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sun, 11 Aug 2019 10:47:19 +1100 Subject: [PATCH] Use full path for all server includes --- src/server/forum_user_handler.hpp | 2 +- src/server/game.hpp | 6 +++--- src/server/player.hpp | 2 +- src/server/player_network.hpp | 4 ++-- src/server/sample_user_handler.hpp | 2 +- src/server/send_receive_wml_helpers.ipp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/server/forum_user_handler.hpp b/src/server/forum_user_handler.hpp index 6384967695f2..db63315d24ad 100644 --- a/src/server/forum_user_handler.hpp +++ b/src/server/forum_user_handler.hpp @@ -14,7 +14,7 @@ #pragma once -#include "user_handler.hpp" +#include "server/user_handler.hpp" #include #include diff --git a/src/server/game.hpp b/src/server/game.hpp index dd326bf589b5..75e4653636cc 100644 --- a/src/server/game.hpp +++ b/src/server/game.hpp @@ -15,9 +15,9 @@ #pragma once #include "mt_rng.hpp" -#include "player.hpp" -#include "player_connection.hpp" -#include "simple_wml.hpp" +#include "server/player.hpp" +#include "server/player_connection.hpp" +#include "server/simple_wml.hpp" #include "utils/make_enum.hpp" #include diff --git a/src/server/player.hpp b/src/server/player.hpp index 18c17371bd15..670c16b92fcd 100644 --- a/src/server/player.hpp +++ b/src/server/player.hpp @@ -14,7 +14,7 @@ #pragma once -#include "simple_wml.hpp" +#include "server/simple_wml.hpp" #include #include diff --git a/src/server/player_network.hpp b/src/server/player_network.hpp index 10dae3e7b870..4284824d1027 100644 --- a/src/server/player_network.hpp +++ b/src/server/player_network.hpp @@ -15,8 +15,8 @@ #pragma once -#include "player.hpp" -#include "simple_wml.hpp" +#include "server/player.hpp" +#include "server/simple_wml.hpp" #include "utils/functional.hpp" #include "log.hpp" diff --git a/src/server/sample_user_handler.hpp b/src/server/sample_user_handler.hpp index 929438c5b484..b19371d1b49d 100644 --- a/src/server/sample_user_handler.hpp +++ b/src/server/sample_user_handler.hpp @@ -14,7 +14,7 @@ #pragma once -#include "user_handler.hpp" +#include "server/user_handler.hpp" #include #include diff --git a/src/server/send_receive_wml_helpers.ipp b/src/server/send_receive_wml_helpers.ipp index 6b253eb8ed60..60350ddc7354 100644 --- a/src/server/send_receive_wml_helpers.ipp +++ b/src/server/send_receive_wml_helpers.ipp @@ -27,8 +27,8 @@ #include #endif -#include "server_base.hpp" -#include "simple_wml.hpp" +#include "server/server_base.hpp" +#include "server/simple_wml.hpp" #include "filesystem.hpp" #include "serialization/unicode_cast.hpp" //only used in windows specific code.