From f290a865fc82981fee422bf8aef50278176965d6 Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Wed, 10 Jun 2015 15:36:47 +0200 Subject: [PATCH] fix compilation the previous code compiled only on msvc. --- src/server/game.cpp | 2 +- src/server/player_network.cpp | 4 ++-- src/server/player_network.hpp | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/server/game.cpp b/src/server/game.cpp index 6d646479d2bf..4b07a30e51ff 100644 --- a/src/server/game.cpp +++ b/src/server/game.cpp @@ -1126,7 +1126,7 @@ void game::process_change_turns_wml(simple_wml::document& data, const player_map set_current_turn(current_turn); num_turns_ = num_turns; - assert(this->current_turn() == current_turn); + assert(static_cast(this->current_turn()) == current_turn); description_->set_attr_dup("turn", describe_turns(current_turn, num_turns_).c_str()); //Dont send or store this change, all players should have gotten it by wml. } diff --git a/src/server/player_network.cpp b/src/server/player_network.cpp index 54bbbd0267cb..6d1fe107c87b 100644 --- a/src/server/player_network.cpp +++ b/src/server/player_network.cpp @@ -17,8 +17,8 @@ #include "../log.hpp" #include "serialization/unicode.hpp" -static lg::log_domain log_config("config"); -#define WRN_CONFIG LOG_STREAM(warn, log_config) +lg::log_domain log_config_pn("config"); +#define WRN_CONFIG LOG_STREAM(warn, log_config_pn) namespace wesnothd { diff --git a/src/server/player_network.hpp b/src/server/player_network.hpp index d549803823e5..511842e4d0d9 100644 --- a/src/server/player_network.hpp +++ b/src/server/player_network.hpp @@ -23,6 +23,7 @@ #include "utils/boost_function_guarded.hpp" #include "../log.hpp" +extern lg::log_domain log_config_pn; namespace wesnothd { namespace chat_message { @@ -94,7 +95,7 @@ void send_to_many(simple_wml::document& data, } } } catch (simple_wml::error& e) { - LOG_STREAM(warn, log_config) << __func__ << ": simple_wml error: " << e.message << std::endl; + LOG_STREAM(warn, log_config_pn) << __func__ << ": simple_wml error: " << e.message << std::endl; } }