mail[Wesnoth-commits] r13044 - /trunk/src/config.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by bruno on August 08, 2006 - 17:42:
Author: brunowolff
Date: Tue Aug  8 17:41:57 2006
New Revision: 13044

URL: http://svn.gna.org/viewcvs/wesnoth?rev=13044&view=rev
Log:
Remove broken comments in 1.2 branch correspond to r13043 in 1.2 branch.


Modified:
    trunk/src/config.cpp

Modified: trunk/src/config.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/config.cpp?rev=13044&r1=13043&r2=13044&view=diff
==============================================================================
--- trunk/src/config.cpp (original)
+++ trunk/src/config.cpp Tue Aug  8 17:41:57 2006
@@ -27,8 +27,6 @@
 
 #define ERR_CF LOG_STREAM(err, config)
 
-// Note this isn't a real copy. The children are still in both config trees
-// and updating them will affect both trees.
 config::config(const config& cfg)
 {
        append(cfg);
@@ -39,8 +37,6 @@
        clear();
 }
 
-// Note this isn't a real copy. The children are still in both config trees
-// and updating them will affect both trees.
 config& config::operator=(const config& cfg)
 {
        if(this == &cfg) {
@@ -54,8 +50,6 @@
        return *this;
 }
 
-// Note this isn't a real copy. The children are still in both config trees
-// and updating them will affect both trees.
 void config::append(const config& cfg)
 {
        for(all_children_iterator i = cfg.ordered_begin(); i != 
cfg.ordered_end(); ++i) {
@@ -537,9 +531,6 @@
 // Create a new config tree as a copy of 'this' overridden by 'c'.
 // Nodes are matched up by name and with name by order. Nodes in 'c',
 // but not in 'this' are added at the end in the order they appeared in 'c'.
-// Note that some nodes in the copied tree are still in both 'this' and 'c'.
-// It worked like this before. This is more efficent, but can have surprising
-// effects if a node is changed in one of these config trees.
 config config::merge_with(const config& c) const
 {
        config n;




Related Messages


Powered by MHonArc, Updated Tue Aug 08 18:40:22 2006