libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 20:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid using Map::merge

Browse Source 
svn-id: r21511
This commit is contained in:
Max Horn 2006-03-31 07:30:43 +00:00
parent e0b3e777cf
commit a23fba7a42
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/config-manager.cpp
View File

@ -501,7 +501,12 @@ void ConfigManager::renameGameDomain(const String &oldName, const String &newNam
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);
}