diff options
| author | Max Horn | 2006-03-31 07:30:43 +0000 |
|---|---|---|
| committer | Max Horn | 2006-03-31 07:30:43 +0000 |
| commit | a23fba7a425da73201ae1c2a5af68bf33286b79b (patch) | |
| tree | a39175c5826fec15cd70f4968c7786c0c0d30820 | |
| parent | e0b3e777cf69105d1c3c887539d4da6577ac071e (diff) | |
| download | scummvm-rg350-a23fba7a425da73201ae1c2a5af68bf33286b79b.tar.gz scummvm-rg350-a23fba7a425da73201ae1c2a5af68bf33286b79b.tar.bz2 scummvm-rg350-a23fba7a425da73201ae1c2a5af68bf33286b79b.zip | |
Avoid using Map::merge
svn-id: r21511
| -rw-r--r-- | common/config-manager.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp index a5d7647289..db17b7e296 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -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); } |