From 2e3c25251abe3c9226167aab87807f0e8a94396d Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 20 Feb 2015 17:51:13 +0100
Subject: [PATCH] Visual Studio 2013 compilation support for NeL Tools

---
 code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp | 2 +-
 code/nel/tools/misc/xml_packer/xml_packer.cpp       | 2 +-
 code/nel/tools/pacs/build_rbank/build_rbank.cpp     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
index 53d515fdd..851dfe6df 100644
--- a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
+++ b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
@@ -163,7 +163,7 @@ void readFormId( string& outputFileName )
 				map<string,uint8>::iterator itFT = FileTypeToId.find(fileType);
 				if( itFT == FileTypeToId.end() )
 				{
-					FileTypeToId.insert( make_pair(fileType,fid.FormIDInfos.Type) );
+					FileTypeToId.insert( std::pair<std::string, uint8>(fileType,fid.FormIDInfos.Type) );
 				}
 			}
 			else
diff --git a/code/nel/tools/misc/xml_packer/xml_packer.cpp b/code/nel/tools/misc/xml_packer/xml_packer.cpp
index 6f82b5426..2d7695de4 100644
--- a/code/nel/tools/misc/xml_packer/xml_packer.cpp
+++ b/code/nel/tools/misc/xml_packer/xml_packer.cpp
@@ -379,7 +379,7 @@ int main(int argc, char *argv[])
 					CSString subFileName = parser.leftCrop(sizeof("	<nel:xml_file name=")-1);
 					subFileName = subFileName.matchDelimiters(false, false, true, false);
 					subFileName = subFileName.unquoteIfQuoted();
-					subFileName = dirName+"/"+subFileName;
+					subFileName = dirName + "/" + subFileName.c_str();
 					
 					printf("Extracting file '%s'...\n", CFile::getFilename(subFileName).c_str());
 					// open the output file 
diff --git a/code/nel/tools/pacs/build_rbank/build_rbank.cpp b/code/nel/tools/pacs/build_rbank/build_rbank.cpp
index 2285873c0..833c6c749 100644
--- a/code/nel/tools/pacs/build_rbank/build_rbank.cpp
+++ b/code/nel/tools/pacs/build_rbank/build_rbank.cpp
@@ -990,7 +990,7 @@ void	processGlobalRetriever()
 		{
 			if (Verbose)
 				nlinfo("unlink: %s", unlinkstr.c_str());
-			faultyInstances.insert(make_pair<uint, CFaultyInstance>(i, fi));
+			faultyInstances.insert(std::pair<uint, CFaultyInstance>(i, fi));
 		}
 	}
 
@@ -1046,7 +1046,7 @@ void	processGlobalRetriever()
 			{
 				if (Verbose)
 					nlinfo("after fix: unlink: %s", unlinkstr.c_str());
-				faultyInstances.insert(make_pair<uint, CFaultyInstance>(i, fi));
+				faultyInstances.insert(std::pair<uint, CFaultyInstance>(i, fi));
 			}
 		}
 	}