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

fixed compile errors on VC++

Browse source
This commit is contained in:
David White 2006-02-05 02:00:12 +00:00
parent d5db8ede04
commit 647af0ac49
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/config.cpp
View file

@ -530,8 +530,8 @@ void config::apply_diff(const config& diff)
config config::merge_with(const config& c) const
{
config n(*this);
for(string_map::const_iterator i = c.values.begin(); i != c.values.end(); ++i) {
n.values[i->first] = i->second;
for(string_map::const_iterator j = c.values.begin(); j != c.values.end(); ++j) {
n.values[j->first] = j->second;
}
const child_map& child_changes = c.all_children();
child_map::const_iterator i;