From 7c79fd574bbe384da6dc86d7ab3f4d2b0a44b53a Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 17 May 2010 14:30:28 +0200
Subject: [PATCH] Changed: #853 Compilation on 64-bits platforms

---
 .../server/src/ai_service/ai_script_comp.cpp  |  6 +--
 .../server/src/ai_service/ais_user_models.cpp |  6 +--
 .../server/src/ai_service/script_compiler.cpp |  2 +-
 .../src/entities_game_service/admin.cpp       | 46 +++++++++----------
 .../egs_sheets/egs_static_brick.cpp           |  2 +-
 .../egs_sheets/egs_static_game_item.cpp       |  4 +-
 .../mission_manager/ai_alias_translator.cpp   |  4 +-
 .../mission_manager/mission_step_queue.cpp    |  4 +-
 .../mission_manager/mission_step_talk.cpp     |  2 +-
 code/ryzom/server/src/pd_lib/pd_lib.cpp       |  4 +-
 code/ryzom/server/src/pd_lib/pd_messages.cpp  |  2 +-
 .../persistant_data_service/db_manager.cpp    |  5 +-
 12 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/code/ryzom/server/src/ai_service/ai_script_comp.cpp b/code/ryzom/server/src/ai_service/ai_script_comp.cpp
index 3bff6fd04..91c747926 100644
--- a/code/ryzom/server/src/ai_service/ai_script_comp.cpp
+++ b/code/ryzom/server/src/ai_service/ai_script_comp.cpp
@@ -11,8 +11,8 @@ using	namespace	NLMISC;
 void	explodeSubStrings(const	std::string	&str, vector<std::string>	&strings, sint32 parenthesis=0)
 {
 	const	std::string	separators("(),");
-	uint32	current=0;
-	uint32	nextCurrent=current;
+	string::size_type	current=0;
+	string::size_type	nextCurrent=current;
 	strings.clear();
 	
 	nextCurrent=str.find_first_of(separators.c_str(), current);
@@ -1060,7 +1060,7 @@ CFightScriptComp	*CFightScriptCompReader::createScriptComp	(const string &str)	t
 {
 	string	scriptCompName;
 	{
-		const	uint32	index=str.find_first_of("()", 0);
+		const	string::size_type	index=str.find_first_of("()", 0);
 		if	(index==string::npos)
 			throw	ReadFightActionException("ScriptComp Creation of :"+str+" Failed because of bad Syntax");
 		scriptCompName=str.substr(0,index);
diff --git a/code/ryzom/server/src/ai_service/ais_user_models.cpp b/code/ryzom/server/src/ai_service/ais_user_models.cpp
index 3f524d9ff..ccccc755e 100644
--- a/code/ryzom/server/src/ai_service/ais_user_models.cpp
+++ b/code/ryzom/server/src/ai_service/ais_user_models.cpp
@@ -35,8 +35,8 @@ void stripWhitespaces(std::string& str)
 {
    if(str.empty()) return;
 
-   int startIndex = str.find_first_not_of(" ");
-   int endIndex = str.find_last_not_of(" ");
+   string::size_type startIndex = str.find_first_not_of(" ");
+   string::size_type endIndex = str.find_last_not_of(" ");
    std::string tmp = str;
    str.erase();
 
@@ -46,7 +46,7 @@ void stripWhitespaces(std::string& str)
 
 std::string removeComment(const std::string &str) 
 {
-	uint newPos= str.find("//",0);
+	string::size_type newPos= str.find("//",0);
 	
 	if (newPos != string::npos)
 	{
diff --git a/code/ryzom/server/src/ai_service/script_compiler.cpp b/code/ryzom/server/src/ai_service/script_compiler.cpp
index 9a7a2bfb6..3d2bd9a78 100644
--- a/code/ryzom/server/src/ai_service/script_compiler.cpp
+++ b/code/ryzom/server/src/ai_service/script_compiler.cpp
@@ -1117,7 +1117,7 @@ void CCompiler::dumpByteCode (const string &sourceCode, const string &fullName,
 {
 	// Build a valid filename
 	string tmp = fullName;
-	int pos;
+	string::size_type pos;
 	while ((pos=tmp.find (':')) != string::npos)
 		tmp[pos] = '-';
 
diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp
index 4a93cf3bd..469e0ad69 100644
--- a/code/ryzom/server/src/entities_game_service/admin.cpp
+++ b/code/ryzom/server/src/entities_game_service/admin.cpp
@@ -1245,17 +1245,17 @@ NLMISC_COMMAND (createItemInBag, "Create an item and put it in the player bag",
 	}
 
 	// banners are the only items in game which use privilege
-	if( sheetName.find("banner") != -1 )
+	if( sheetName.find("banner") != string::npos )
 	{
 		CPlayer * player = PlayerManager.getPlayer( PlayerManager.getPlayerId(eid) );
 //		if (player != NULL && !player->havePriv(":DEV:") )
 		if (player != NULL && player->havePriv(BannerPriv) )
 		{
-			if( sheetName.find("_gu") != -1 && !player->havePriv(":G:") )	return false;
-			if( sheetName.find("_sgu") != -1 && !player->havePriv(":SG:") )	return false;
-			if( sheetName.find("_vgu") != -1 && !player->havePriv(":VG:") )	return false;
-			if( sheetName.find("_gm") != -1 && !player->havePriv(":GM:") )	return false;
-			if( sheetName.find("_sgm") != -1 && !player->havePriv(":SGM:") )	return false;
+			if( sheetName.find("_gu") != string::npos && !player->havePriv(":G:") )	return false;
+			if( sheetName.find("_sgu") != string::npos && !player->havePriv(":SG:") )	return false;
+			if( sheetName.find("_vgu") != string::npos && !player->havePriv(":VG:") )	return false;
+			if( sheetName.find("_gm") != string::npos && !player->havePriv(":GM:") )	return false;
+			if( sheetName.find("_sgm") != string::npos && !player->havePriv(":SGM:") )	return false;
 		}
 	}
 
@@ -1333,16 +1333,16 @@ NLMISC_COMMAND (createItemInTmpInv, "Create an item and put it in the player tem
 	}
 
 	// banners are the only items in game which use privilege
-	if( sheetName.find("banner") != -1 )
+	if( sheetName.find("banner") != string::npos )
 	{
 		CPlayer * player = PlayerManager.getPlayer( PlayerManager.getPlayerId(eid) );
 		if (player != NULL && player->havePriv(BannerPriv) )
 		{
-			if( sheetName.find("_gu") != -1 && !player->havePriv(":G:") )	return false;
-			if( sheetName.find("_sgu") != -1 && !player->havePriv(":SG:") )	return false;
-			if( sheetName.find("_vgu") != -1 && !player->havePriv(":VG:") )	return false;
-			if( sheetName.find("_gm") != -1 && !player->havePriv(":GM:") )	return false;
-			if( sheetName.find("_sgm") != -1 && !player->havePriv(":SGM:") )	return false;
+			if( sheetName.find("_gu") != string::npos && !player->havePriv(":G:") )	return false;
+			if( sheetName.find("_sgu") != string::npos && !player->havePriv(":SG:") )	return false;
+			if( sheetName.find("_vgu") != string::npos && !player->havePriv(":VG:") )	return false;
+			if( sheetName.find("_gm") != string::npos && !player->havePriv(":GM:") )	return false;
+			if( sheetName.find("_sgm") != string::npos && !player->havePriv(":SGM:") )	return false;
 		}
 	}
 
@@ -1403,16 +1403,16 @@ NLMISC_COMMAND (createItemInInv, "Create items and put them in the given invento
 	}
 
 	// banners are the only items in game which use privilege
-	if( sheetName.find("banner") != -1 )
+	if( sheetName.find("banner") != string::npos )
 	{
 		CPlayer * player = PlayerManager.getPlayer( PlayerManager.getPlayerId(eid) );
 		if (player != NULL && player->havePriv(BannerPriv) )
 		{
-			if( sheetName.find("_gu") != -1 && !player->havePriv(":G:") )	return false;
-			if( sheetName.find("_sgu") != -1 && !player->havePriv(":SG:") )	return false;
-			if( sheetName.find("_vgu") != -1 && !player->havePriv(":VG:") )	return false;
-			if( sheetName.find("_gm") != -1 && !player->havePriv(":GM:") )	return false;
-			if( sheetName.find("_sgm") != -1 && !player->havePriv(":SGM:") )	return false;
+			if( sheetName.find("_gu") != string::npos && !player->havePriv(":G:") )	return false;
+			if( sheetName.find("_sgu") != string::npos && !player->havePriv(":SG:") )	return false;
+			if( sheetName.find("_vgu") != string::npos && !player->havePriv(":VG:") )	return false;
+			if( sheetName.find("_gm") != string::npos && !player->havePriv(":GM:") )	return false;
+			if( sheetName.find("_sgm") != string::npos && !player->havePriv(":SGM:") )	return false;
 		}
 	}
 
@@ -4039,12 +4039,12 @@ NLMISC_COMMAND(broadcast,"[repeat=<num repeat> or during=<time in seconds>] [eve
 	uint32 during = 0;
 	uint32 every = 0;
 
-	sint32 posMessage = 0;
+	string::size_type posMessage = 0;
 
-	sint32 pos = message.find("repeat");
+	string::size_type pos = message.find("repeat");
 	if( pos != string::npos )
 	{
-		sint32 posEgale = message.find("=", pos);
+		string::size_type posEgale = message.find("=", pos);
 		if( posEgale != string::npos )
 		{
 			repeat = atoi( message.substr( posEgale+1 ).c_str() );
@@ -4056,7 +4056,7 @@ NLMISC_COMMAND(broadcast,"[repeat=<num repeat> or during=<time in seconds>] [eve
 	pos = message.find("during");
 	if( pos != string::npos )
 	{
-		sint32 posEgale = message.find("=", pos);
+		string::size_type posEgale = message.find("=", pos);
 		if( posEgale != string::npos )
 		{
 			during = atoi( message.substr( posEgale+1 ).c_str() );
@@ -4068,7 +4068,7 @@ NLMISC_COMMAND(broadcast,"[repeat=<num repeat> or during=<time in seconds>] [eve
 	pos = message.find("every");
 	if( pos != string::npos )
 	{
-		sint32 posEgale = message.find("=", pos);
+		string::size_type posEgale = message.find("=", pos);
 		if( posEgale != string::npos )
 		{
 			every = atoi( message.substr( posEgale+1 ).c_str() );
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp
index d0b700056..b3c947c7e 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp
@@ -335,7 +335,7 @@ void CStaticBrick::readStaticBrick( const NLGEORGES::UFormElm &root, const NLMIS
 		if(Family==BRICK_FAMILIES::Unknown)
 		{
 			string	sheetName= sheetId.toString();
-			sint	end= sheetName.find(".sbrick")-NB_LETTERS_AFTER_FAMILY;
+			string::size_type	end= sheetName.find(".sbrick")-NB_LETTERS_AFTER_FAMILY;
 			string sub = sheetName.substr(0,end);
 			sub = strupr(sub);
 			Family = BRICK_FAMILIES::toSBrickFamily ( sub );
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp
index 47c9af2c9..8d651ef55 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp
@@ -976,8 +976,8 @@ void loadCosmetics(  NLGEORGES::UFormElm &root, CStaticItem *item, const NLMISC:
 
 	std::string name = sheetId.toString();
 
-	sint pos = (sint)name.find('.',0);
-	if ( pos == (sint) string::npos)
+	string::size_type pos = name.find('.',0);
+	if ( pos == string::npos)
 		nlwarning("<loadCosmetics> Can't load the VPValue from sheet name in sheet %s", sheetId.toString().c_str() );
 	else
 	{
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/ai_alias_translator.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/ai_alias_translator.cpp
index 06683a121..f59982315 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/ai_alias_translator.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/ai_alias_translator.cpp
@@ -119,7 +119,7 @@ void CAIAliasTranslator::buildBotTree(const NLLIGO::IPrimitive* prim)
 
 			NLMISC::strlwr(name);
 			//remove AI name parameters
-			uint trash = name.find('$');
+			string::size_type trash = name.find('$');
 			if ( trash != string::npos )
 			{
 				name.resize(trash);
@@ -157,7 +157,7 @@ void CAIAliasTranslator::buildBotTree(const NLLIGO::IPrimitive* prim)
 
 		//	NLMISC::strlwr(name);
 			//remove AI name parameters
-		//	uint trash = name.find('$');
+		//	string::size_type trash = name.find('$');
 		//	if ( trash != string::npos )
 		//	{
 		//		name.resize(trash);
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_queue.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_queue.cpp
index ac23524c2..4ab1c4289 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_queue.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_queue.cpp
@@ -60,7 +60,7 @@ bool CMissionStepQueueStart::buildStep( uint32 line, const vector< string > & sc
 			QueueName = missionData.Name + "_" + script[1];
 		
 		// remove all blanks in name
-		uint pos = QueueName.find_first_of(" ");
+		string::size_type pos = QueueName.find_first_of(" ");
 		while ( pos != string::npos )
 		{
 			QueueName.erase(pos,1);
@@ -203,7 +203,7 @@ bool CMissionStepQueueEnd::buildStep( uint32 line, const vector< string > & scri
 		QueueName = missionData.Name + "_" + script[1];
 
 	// remove all blanks in name
-	uint pos = QueueName.find_first_of(" ");
+	string::size_type pos = QueueName.find_first_of(" ");
 	while ( pos != string::npos )
 	{
 		QueueName.erase(pos,1);
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp
index 32fe4e080..5616e35b7 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp
@@ -674,7 +674,7 @@ bool CMissionStepDynChat::buildStep( uint32 line, const std::vector< std::string
 	for  (uint i = 3; i < script.size(); i++ )
 	{
 		string answerStr = CMissionParser::getNoBlankString( script[i] );
-		uint pos = answerStr.find( ' ' );
+		string::size_type pos = answerStr.find( ' ' );
 		if( pos == string::npos || answerStr.empty() )
 		{
 			MISLOGERROR1("invalid answer '%s'", answerStr.c_str());
diff --git a/code/ryzom/server/src/pd_lib/pd_lib.cpp b/code/ryzom/server/src/pd_lib/pd_lib.cpp
index ccc1cdd21..d80be70e6 100644
--- a/code/ryzom/server/src/pd_lib/pd_lib.cpp
+++ b/code/ryzom/server/src/pd_lib/pd_lib.cpp
@@ -598,7 +598,7 @@ void	CPDSLib::update()
 		// setup update logs with full timestamp
 		if (!_DbMessageQueue.empty())
 		{
-			i = _UpdateLogs.size();
+			i = (uint)_UpdateLogs.size();
 			_UpdateLogs.resize(_DbMessageQueue.size());
 
 			for (; i<_UpdateLogs.size(); ++i)
@@ -1025,7 +1025,7 @@ std::string	CPDSLib::getPDSRootDirectory(const std::string& shard, bool wantRemo
 	}
 
 	std::string	findstr("$shard");
-	uint		p = dir.find(findstr);
+	std::string::size_type p = dir.find(findstr);
 
 	if (p != std::string::npos)
 		dir.replace(p, findstr.size(), shard);
diff --git a/code/ryzom/server/src/pd_lib/pd_messages.cpp b/code/ryzom/server/src/pd_lib/pd_messages.cpp
index 2a88a33b1..da5d8fd01 100644
--- a/code/ryzom/server/src/pd_lib/pd_messages.cpp
+++ b/code/ryzom/server/src/pd_lib/pd_messages.cpp
@@ -605,7 +605,7 @@ bool	CUpdateLog::selectMessages(const CDBDescriptionParser& description, const N
 {
 	bool	selected = false;
 
-	uint	pos = valuePath.find('.');
+	std::string::size_type pos = valuePath.find('.');
 	if (pos == std::string::npos)
 		return false;
 
diff --git a/code/ryzom/server/src/persistant_data_service/db_manager.cpp b/code/ryzom/server/src/persistant_data_service/db_manager.cpp
index 44545fb42..8c0715405 100644
--- a/code/ryzom/server/src/persistant_data_service/db_manager.cpp
+++ b/code/ryzom/server/src/persistant_data_service/db_manager.cpp
@@ -571,7 +571,8 @@ bool	CDbManager::parsePath(const string &strPath, CLocatePath &lpath)
 		anode.Set = false;
 		anode.Array = false;
 
-		uint	pos = node.find_first_of("[<");
+		string::size_type pos = node.find_first_of("[<");
+
 		if (pos != string::npos)
 		{
 			if (node[pos] == '[')
@@ -581,7 +582,7 @@ bool	CDbManager::parsePath(const string &strPath, CLocatePath &lpath)
 
 			anode.Name = node.substr(0, pos);
 
-			uint	end = node.find((anode.Array ? ']' : '>'), pos);
+			string::size_type end = node.find((anode.Array ? ']' : '>'), pos);
 			if (end == string::npos)
 				return false;