fix compilation

the previous code compiled only on msvc.
wesnoth · Jun 10, 2015 · f290a86 · f290a86
1 parent 9e1aae1
commit f290a86
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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<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.
 }

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