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

Fix the other code with the implicit conversion...

Browse source 
...of std::string to n_token::t_token when creating a new vector
This commit is contained in:
Timotei Dolean 2011-09-09 16:04:18 +00:00
parent bb02feb844
commit da675c18d1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/serialization/string_utils.cpp
View file

@ -106,7 +106,8 @@ struct t_calc_cache_item {
std::vector<std::string> vstr(split(static_cast<std::string const &>(x.val), x.c, x.flags));
t_out retval;
foreach(std::string const & s, vstr){
retval.push_back(n_token::t_token(s)); }
retval.push_back(n_token::t_token(s));
}
return retval;
}
};
@ -188,7 +189,10 @@ size_t hash_value(t_paren_split_inputs const & a){
struct t_calc_paren_cache_item {
t_out const operator()(t_paren_split_inputs const & x){
std::vector<std::string> vstr(utils::parenthetical_split((*x.val), x.separator, x.left, x.right, x.flags));
t_out const retval(vstr.begin(), vstr.end());
t_out retval;
foreach(std::string const & s, vstr){
retval.push_back(n_token::t_token(s));
}
return retval;
}
};