Author: sapient
Date: Tue Apr 8 08:12:24 2008
New Revision: 25673
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25673&view=rev
Log:
add a usage warning about the nonstandard (and possibly buggy) behavior in
merge_and_keep
Modified:
trunk/src/config.hpp
Modified: trunk/src/config.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/config.hpp?rev=25673&r1=25672&r2=25673&view=diff
==============================================================================
--- trunk/src/config.hpp (original)
+++ trunk/src/config.hpp Tue Apr 8 08:12:24 2008
@@ -152,8 +152,11 @@
//! 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;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
