[Scummvm-cvs-logs] SF.net SVN: scummvm: [21511] scummvm/trunk/common/config-manager.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Thu Mar 30 23:31:04 CEST 2006


Revision: 21511
Author:   fingolfin
Date:     2006-03-30 23:30:43 -0800 (Thu, 30 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21511&view=rev

Log Message:
-----------
Avoid using Map::merge

Modified Paths:
--------------
    scummvm/trunk/common/config-manager.cpp
Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp	2006-03-31 07:22:49 UTC (rev 21510)
+++ scummvm/trunk/common/config-manager.cpp	2006-03-31 07:30:43 UTC (rev 21511)
@@ -501,7 +501,12 @@
 	assert(isValidDomainName(oldName));
 	assert(isValidDomainName(newName));
 
-	_gameDomains[newName].merge(_gameDomains[oldName]);
+//	_gameDomains[newName].merge(_gameDomains[oldName]);
+	Domain &oldDom(_gameDomains[oldName]);
+	Domain &newDom(_gameDomains[newName]);
+	Domain::const_iterator iter;
+	for (iter = oldDom.begin(); iter != oldDom.end(); ++iter)
+		newDom[iter->_key] = iter->_value;
 
 	_gameDomains.erase(oldName);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list