From ebdc7ba16b8bc125bdddf82f55bc61376355b3e5 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 23 Feb 2015 12:25:23 +0100
Subject: [PATCH] Visual Studio 2013 compilation support for Ryzom Server

---
 code/ryzom/server/src/pd_lib/db_description_parser.cpp |  2 +-
 code/ryzom/server/src/pd_lib/pd_lib.cpp                |  2 +-
 code/ryzom/server/src/pd_lib/pd_messages.cpp           |  6 +++---
 code/ryzom/server/src/pd_lib/pd_string_mapper.cpp      |  2 +-
 code/ryzom/server/src/pd_lib/pd_utils.h                | 10 +++++++---
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/code/ryzom/server/src/pd_lib/db_description_parser.cpp b/code/ryzom/server/src/pd_lib/db_description_parser.cpp
index 175000cf2..55eb4a3d6 100644
--- a/code/ryzom/server/src/pd_lib/db_description_parser.cpp
+++ b/code/ryzom/server/src/pd_lib/db_description_parser.cpp
@@ -260,7 +260,7 @@ bool	CDBDescriptionParser::loadType(xmlNodePtr node)
 				return false;
 			}
 
-			typeNode.EnumValues.push_back(make_pair<string, uint32>(name, value));
+			typeNode.EnumValues.push_back(std::pair<string, uint32>(name, value));
 
 			if (typeNode.Dimension <= value)
 				typeNode.Dimension = value;
diff --git a/code/ryzom/server/src/pd_lib/pd_lib.cpp b/code/ryzom/server/src/pd_lib/pd_lib.cpp
index f57a4be62..1a2cda9ba 100644
--- a/code/ryzom/server/src/pd_lib/pd_lib.cpp
+++ b/code/ryzom/server/src/pd_lib/pd_lib.cpp
@@ -571,7 +571,7 @@ void	CPDSLib::update()
 			CMessage*	msgupd = new CMessage("PD_UPDATE");
 			msgupd->serial(_DatabaseId);
 			msgupd->serial(_UpdateId);
-			_QueuedMessages.push_back(make_pair<uint32,CMessage*>(_UpdateId, msgupd));
+			_QueuedMessages.push_back(std::pair<uint32, CMessage*>(_UpdateId, msgupd));
 			++_UpdateId;
 
 			// serial queue
diff --git a/code/ryzom/server/src/pd_lib/pd_messages.cpp b/code/ryzom/server/src/pd_lib/pd_messages.cpp
index 253855d46..b5e731d95 100644
--- a/code/ryzom/server/src/pd_lib/pd_messages.cpp
+++ b/code/ryzom/server/src/pd_lib/pd_messages.cpp
@@ -504,7 +504,7 @@ bool	CUpdateLog::selectMessages(const CDBDescriptionParser& description, const N
 
 		if (message.getType() == CDbMessage::PushContext)
 		{
-			contextsStart.push_back(std::make_pair<uint, bool>(msg, false));
+			contextsStart.push_back(std::pair<uint, bool>(msg, false));
 		}
 		else if (message.getType() == CDbMessage::PopContext)
 		{
@@ -561,7 +561,7 @@ bool	CUpdateLog::selectMessages(const CDBDescriptionParser& description, const s
 
 		if (message.getType() == CDbMessage::PushContext)
 		{
-			contextsStart.push_back(std::make_pair<uint, bool>(msg, false));
+			contextsStart.push_back(std::pair<uint, bool>(msg, false));
 		}
 		else if (message.getType() == CDbMessage::PopContext)
 		{
@@ -644,7 +644,7 @@ bool	CUpdateLog::selectMessages(const CDBDescriptionParser& description, const N
 
 		if (message.getType() == CDbMessage::PushContext)
 		{
-			contextsStart.push_back(std::make_pair<uint, bool>(msg, false));
+			contextsStart.push_back(std::pair<uint, bool>(msg, false));
 		}
 		else if (message.getType() == CDbMessage::PopContext)
 		{
diff --git a/code/ryzom/server/src/pd_lib/pd_string_mapper.cpp b/code/ryzom/server/src/pd_lib/pd_string_mapper.cpp
index 184d4bb7f..7a326dc67 100644
--- a/code/ryzom/server/src/pd_lib/pd_string_mapper.cpp
+++ b/code/ryzom/server/src/pd_lib/pd_string_mapper.cpp
@@ -64,7 +64,7 @@ void	CPDStringMapper::setMapping(const std::string& str, uint32 id)
 		return;
 	}
 
-	its = _StringMap.insert(std::make_pair<std::string, uint32>(lowMapStr, id)).first;
+	its = _StringMap.insert(std::pair<std::string, uint32>(lowMapStr, id)).first;
 	_IdMap[id] = its;
 }
 
diff --git a/code/ryzom/server/src/pd_lib/pd_utils.h b/code/ryzom/server/src/pd_lib/pd_utils.h
index 73a0268d8..0f0ab46d5 100644
--- a/code/ryzom/server/src/pd_lib/pd_utils.h
+++ b/code/ryzom/server/src/pd_lib/pd_utils.h
@@ -494,9 +494,13 @@ struct CColumnIndexHashMapTraits
 	static const size_t min_buckets = 8;
 	CColumnIndexHashMapTraits() { }
 	size_t operator() (const CColumnIndex &id) const
-		{
-			return id.hash();
-		}
+	{
+		return id.hash();
+	}
+	bool operator()(const CColumnIndex &left, const CColumnIndex &right)
+	{
+		return left.hash() < right.hash();
+	}
 };
 
 class CSetMap