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

add a usage warning about the nonstandard (and possibly buggy) behavior...

Browse source 
...in merge_and_keep
This commit is contained in:
Patrick Parker 2008-04-08 06:12:24 +00:00
parent 4c2a539e54
commit 3e3268ac86
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/config.hpp
View file

@ -152,8 +152,11 @@ public:
//! Merge config 'c' into this config.
//! Overwrites this config's values.
void merge_with(const config& c);
//! Merge config 'c' into this config.
//! Keeps this config's values and does not add existing elements.
//! NOTICE: other nonstandard behavior includes no merge recursion into child
//! and has limited merging for child lists of differing lengths
void merge_and_keep(const config& c);
bool matches(const config &filter) const;