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

explicitly convert some config::attribute_value to std::string

Browse source 
This works around compiler errors I get in MSVC9
on the new machine only for some reason.
This commit is contained in:
Anonymissimus 2012-05-06 21:53:09 +00:00
parent 4ebe6a850f
commit a9b7d0ec49
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/multiplayer_connect.cpp
View file

@ -160,7 +160,7 @@ connect::side::side(connect& parent, const config& cfg, int index) :
std::vector<std::string>::const_iterator itor =
std::find(parent_->team_names_.begin(), parent_->team_names_.end(),
cfg["team_name"]);
cfg["team_name"].str());
if(itor == parent_->team_names_.end()) {
assert(!parent_->team_names_.empty());
team_ = 0;
@ -1554,7 +1554,7 @@ void connect::lists_init()
}
std::vector<std::string>::const_iterator itor = std::find(team_names_.begin(),
team_names_.end(), team_name);
team_names_.end(), team_name.str());
if(itor == team_names_.end()) {
team_names_.push_back(team_name);
user_team_names_.push_back(user_team_name.t_str().to_serialized());
@ -1576,7 +1576,7 @@ void connect::lists_init()
team_name = side_num;
std::vector<std::string>::const_iterator itor = std::find(map_team_names.begin(),
map_team_names.end(), team_name);
map_team_names.end(), team_name.str());
if(itor == map_team_names.end()) {
map_team_names.push_back(team_name);
team_name = lexical_cast<std::string>(map_team_names.size());

2
src/unit_types.cpp
View file

@ -158,7 +158,7 @@ bool attack_type::apply_modification(const config& cfg,std::string* description)
config new_specials;
foreach (const config::any_child &vp, specials.all_children_range()) {
std::vector<std::string>::const_iterator found_id =
std::find(dsl.begin(), dsl.end(), vp.cfg["id"]);
std::find(dsl.begin(), dsl.end(), vp.cfg["id"].str());
if (found_id == dsl.end()) {
new_specials.add_child(vp.key, vp.cfg);
}