0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace many lexical_cast with lexical_cast_default

Browse source 
This is to avoid bad_lexical_cast exception. I'm not sure if in
any cases this could actually have thrown but it's better to be
safe.

Conflicts:
	src/server/game.cpp
This commit is contained in:
Chris Beck 2014-11-17 18:55:17 -05:00
parent 2cb85bd161
commit bb9aabd1b8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/server/game.cpp
View file

@ -508,7 +508,7 @@ void game::change_controller(const size_t side_num,
{
DBG_GAME << __func__ << "...\n";
const std::string& side = lexical_cast<std::string, size_t>(side_num + 1);
const std::string& side = lexical_cast_default<std::string, size_t>(side_num + 1);
sides_[side_num] = sock;
if (player_left && side_controllers_[side_num] == "ai") {
@ -912,11 +912,11 @@ bool game::process_turn(simple_wml::document& data, const player_map::const_iter
if (side_num < 1 || side_num > gamemap::MAX_PLAYERS
|| sides_[side_num - 1] != user->first) {
if (user->first == current_player()) {
speak.set_attr_dup("side", lexical_cast<std::string>(current_side() + 1).c_str());
speak.set_attr_dup("side", lexical_cast_default<std::string>(current_side() + 1).c_str());
} else {
const side_vector::const_iterator s =
std::find(sides_.begin(), sides_.end(), user->first);
speak.set_attr_dup("side", lexical_cast<std::string>(s - sides_.begin() + 1).c_str());
speak.set_attr_dup("side", lexical_cast_default<std::string>(s - sides_.begin() + 1).c_str());
}
}
}
@ -1211,7 +1211,7 @@ bool game::remove_player(const network::connection player, const bool disconnect
}
//send the host a notification of removal of this side
const std::string side_drop = lexical_cast<std::string, size_t>(side_num + 1);
const std::string side_drop = lexical_cast_default<std::string, size_t>(side_num + 1);
simple_wml::document drop;
drop.root().set_attr("side_drop", side_drop.c_str());
drop.root().set_attr("controller", side_controllers_[side_num].c_str());

2
src/server/room_manager.cpp
View file

@ -532,7 +532,7 @@ void room_manager::fill_room_list(simple_wml::node& root)
const room& r = *tr.second;
simple_wml::node& room = rooms.add_child("room");
room.set_attr_dup("name", r.name().c_str());
room.set_attr_dup("size", lexical_cast<std::string>(r.members().size()).c_str());
room.set_attr_dup("size", lexical_cast_default<std::string>(r.members().size()).c_str());
}
}

2
src/server/server.cpp
View file

@ -2409,7 +2409,7 @@ void server::process_data_game(const network::connection sock,
}
g->set_description(&desc);
desc.set_attr_dup("id", lexical_cast<std::string>(g->id()).c_str());
desc.set_attr_dup("id", lexical_cast_default<std::string>(g->id()).c_str());
} else {
WRN_SERVER << network::ip_address(sock) << "\t" << pl->second.name()
<< "\tsent scenario data in game:\t\"" << g->name() << "\" ("