upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 09:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation

Browse Source 
the previous code compiled only on msvc.
This commit is contained in:
gfgtdf 2015-06-10 15:36:47 +02:00
parent 9e1aae1f79
commit f290a865fc
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game.cpp
View File

@ -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<int>(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.
}

4
src/server/player_network.cpp
View File

@ -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 {

3
src/server/player_network.hpp
View File

@ -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;
}
}