From bf752b276f47c162fdc387c55b994bfda8a323e6 Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Fri, 9 Nov 2018 22:14:42 +0000
Subject: [PATCH] fix building against current gcc v8 libs

---
 .../serverGame/src/shared/object/GuildObject.cpp       | 10 +++++-----
 .../shared/library/sharedDebug/src/linux/DebugHelp.cpp | 10 ++++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/engine/server/library/serverGame/src/shared/object/GuildObject.cpp b/engine/server/library/serverGame/src/shared/object/GuildObject.cpp
index 0ee903a1..b3b87ac4 100755
--- a/engine/server/library/serverGame/src/shared/object/GuildObject.cpp
+++ b/engine/server/library/serverGame/src/shared/object/GuildObject.cpp
@@ -398,7 +398,7 @@ GuildInfo const * GuildObject::getGuildInfo(int guildId) const
 
 GuildMemberInfo const * GuildObject::getGuildMemberInfo(int guildId, NetworkId const &memberId) const
 {
-	std::map<std::pair<int, NetworkId>, GuildMemberInfo, GuildObject>::const_iterator const iterFind = m_membersInfo.find(std::make_pair(guildId, memberId));
+	const auto iterFind = m_membersInfo.find(std::make_pair(guildId, memberId));
 	if (iterFind != m_membersInfo.end())
 		return &(iterFind->second);
 
@@ -486,7 +486,7 @@ void GuildObject::getGuildMemberIds(int guildId, std::vector<NetworkId> &results
 {
 	results.clear();
 
-	for (std::map<std::pair<int, NetworkId>, GuildMemberInfo, GuildObject>::const_iterator iter = m_membersInfo.lower_bound(std::make_pair(guildId, NetworkId::cms_invalid)); iter != m_membersInfo.end(); ++iter)
+	for (auto iter = m_membersInfo.lower_bound(std::make_pair(guildId, NetworkId::cms_invalid)); iter != m_membersInfo.end(); ++iter)
 	{
 		if (iter->first.first != guildId)
 			break;
@@ -501,7 +501,7 @@ void GuildObject::getMemberIdsWithPermissions(int guildId, int permissions, std:
 {
 	results.clear();
 
-	for (std::map<std::pair<int, NetworkId>, GuildMemberInfo, GuildObject>::const_iterator iter = m_membersInfo.lower_bound(std::make_pair(guildId, NetworkId::cms_invalid)); iter != m_membersInfo.end(); ++iter)
+	for (auto iter = m_membersInfo.lower_bound(std::make_pair(guildId, NetworkId::cms_invalid)); iter != m_membersInfo.end(); ++iter)
 	{
 		if (iter->first.first != guildId)
 			break;
@@ -635,7 +635,7 @@ void GuildObject::disbandGuild(int guildId)
 		// remove all members
 		{
 			std::vector<NetworkId> memberIds;
-			for (std::map<std::pair<int, NetworkId>, GuildMemberInfo, GuildObject>::const_iterator iter = m_membersInfo.lower_bound(std::make_pair(guildId, NetworkId::cms_invalid)); iter != m_membersInfo.end(); ++iter)
+			for (auto iter = m_membersInfo.lower_bound(std::make_pair(guildId, NetworkId::cms_invalid)); iter != m_membersInfo.end(); ++iter)
 			{
 				if (iter->first.first != guildId)
 					break;
@@ -647,7 +647,7 @@ void GuildObject::disbandGuild(int guildId)
 				m_members.erase(memberSpec);
 			}
 
-			for (std::vector<NetworkId>::const_iterator iterMemberId = memberIds.begin(); iterMemberId != memberIds.end(); ++iterMemberId)
+			for (auto iterMemberId = memberIds.begin(); iterMemberId != memberIds.end(); ++iterMemberId)
 			{
 				std::map<NetworkId, int>::const_iterator iterFind = m_fullMembers.find(*iterMemberId);
 				if ((iterFind != m_fullMembers.end()) && (iterFind->second == guildId))
diff --git a/engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp b/engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp
index 8e3ba4bc..c1639ebd 100755
--- a/engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp
+++ b/engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp
@@ -81,7 +81,13 @@ char SymbolCache::ms_memPool[SymbolCache::cms_memPoolMaxBytes];
 char *SymbolCache::ms_memPoolFreeList;
 Mutex SymbolCache::ms_memPoolMutex;
 SymbolCache::SymbolInfo SymbolCache::ms_nullSym;
-typedef std::map<void const *, SymbolCache::SymbolInfo, std::less<void const *>, SymbolCacheAllocator<std::pair<void const *, SymbolCache::SymbolInfo> > > SymbolMap;
+
+typedef std::map<
+	void const *, 
+	SymbolCache::SymbolInfo 
+> SymbolMap;
+
+
 typedef std::vector<char const *, SymbolCacheAllocator<char const *> > UniqueStringVector;
 static SymbolMap ms_cacheMap;
 static UniqueStringVector ms_uniqueStringVector;
@@ -567,7 +573,7 @@ static bool stabsFind(void const *addr, Dl_info const &info, char const *& retSr
 
 SymbolCache::SymbolInfo const &SymbolCache::lookup(void const *addr)
 {
-	SymbolMap::const_iterator i = ms_cacheMap.find(addr);
+	auto i = ms_cacheMap.find(addr);
 	if (i != ms_cacheMap.end())
 		return (*i).second;