From a23fba7a425da73201ae1c2a5af68bf33286b79b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 31 Mar 2006 07:30:43 +0000
Subject: Avoid using Map::merge

svn-id: r21511
---
 common/config-manager.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'common/config-manager.cpp')

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);
 }
-- 
cgit v1.2.3