Changed: #825 Remove all warning when compiling Ryzom on Linux

code/ryzom/tools/leveldesign/georges_convert/form_body_elt_struct.cpp

@@ -162,7 +162,7 @@ bool CFormBodyEltStruct::Empty() const
 
 uint32 CFormBodyEltStruct::GetNbElt () const
 {
-	return vpbodyelt.size();
+	return (uint32)vpbodyelt.size();
 }
 
 CFormBodyElt* CFormBodyEltStruct::GetElt( const unsigned int _index ) const

code/ryzom/tools/leveldesign/georges_convert/item.cpp

@@ -235,19 +235,19 @@ void CItem::SetCurrentValue( const unsigned int _index, const CStringEx s )
 	pitemes->SetModified( _index );
 }
 
-unsigned int CItem::GetNbElt() const
+uint CItem::GetNbElt() const
 {
 	if( pitemes )
 		return( pitemes->GetNbElt() );
 	return( 0 );
 }
 
-unsigned int CItem::GetNbParents() const
+uint CItem::GetNbParents() const
 {
-	return( vsxparents.size() );
+	return (uint)vsxparents.size();
 }
 
-unsigned int CItem::GetNbElt( const unsigned int _index ) const
+uint CItem::GetNbElt( const unsigned int _index ) const
 {
 	CItemElt* pie = GetElt( _index );
 	if( !pie )
@@ -255,7 +255,7 @@ unsigned int CItem::GetNbElt( const unsigned int _index ) const
 	return( pie->GetNbElt() );
 }
 
-unsigned int CItem::GetInfos( const unsigned int _index ) const
+uint CItem::GetInfos( const unsigned int _index ) const
 {
 	CItemElt* pie = GetElt( _index );
 	if( !pie )

code/ryzom/tools/leveldesign/georges_convert/item.h

@@ -57,10 +57,10 @@ public:
 	void MakeItem (CForm &in);
 
 	void SetCurrentValue( const unsigned int _index, const CStringEx s );
-	unsigned int GetNbElt() const;
+	uint GetNbElt() const;
-	unsigned int GetNbParents() const;
+	uint GetNbParents() const;
-	unsigned int GetNbElt( const unsigned int _index ) const;
+	uint GetNbElt( const unsigned int _index ) const;
-	unsigned int GetInfos( const unsigned int _index ) const;
+	uint GetInfos( const unsigned int _index ) const;
 	CStringEx GetName( const unsigned int _index ) const;
 	CStringEx GetCurrentResult( const unsigned int _index ) const;
 	CStringEx GetCurrentValue( const unsigned int _index ) const;

code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h

@@ -457,7 +457,7 @@ public:
 
 
 	/// Get full paths of files to publish
-	uint getFileToPublishCount() { return _FilesToPublish.size(); }
+	uint getFileToPublishCount() { return (uint)_FilesToPublish.size(); }
 	std::string getFileToPublish(uint index) { nlassert(index < _FilesToPublish.size()); return _FilesToPublish[index]; }
 
 	
@@ -467,7 +467,7 @@ public:
 	}
 	uint getMissionsCount()
 	{
-		return _CompiledMission.size();
+		return (uint)_CompiledMission.size();
 	}
 	TMissionDataPtr	getMission(uint index)
 	{

code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp

@@ -1677,7 +1677,7 @@ class CContentKill : public CContentObjective
 	{
 		if (!_KillFaunas.empty())
 		{
-			numEntry = _KillFaunas.size();
+			numEntry = (uint32)_KillFaunas.size();
 			predef.resize(numEntry);
 			for (uint i=0; i<_KillFaunas.size(); ++i)
 			{
@@ -1691,7 +1691,7 @@ class CContentKill : public CContentObjective
 		}
 		else if (!_KillRaces.empty())
 		{
-			numEntry = _KillRaces.size();
+			numEntry = (uint32)_KillRaces.size();
 			predef.resize(numEntry);
 			for (uint i=0; i<_KillRaces.size(); ++i)
 			{
@@ -1712,7 +1712,7 @@ class CContentKill : public CContentObjective
 		}
 		else if (!_KillNpcs.empty())
 		{
-			numEntry = _KillNpcs.size();
+			numEntry = (uint32)_KillNpcs.size();
 			predef.resize(numEntry);
 			for (uint i=0; i<_KillNpcs.size(); ++i)
 			{
@@ -2013,7 +2013,7 @@ class CContentCast : public CContentObjective
 	void getPredefParam(uint32 &numEntry, CPhrase::TPredefParams &predef)
 	
 	{
-		numEntry = _Actions.size();
+		numEntry = (uint32)_Actions.size();
 		predef.resize(numEntry);
 		for (uint i=0; i<numEntry; ++i)
 		{
@@ -2083,7 +2083,7 @@ class CContentForage : public CContentObjective
 
 	virtual void getPredefParam(uint32 &numEntry, CPhrase::TPredefParams &predef)
 	{
-		numEntry = _Mps.size();
+		numEntry = (uint32)_Mps.size();
 		predef.resize(numEntry);
 		for (uint i=0; i<numEntry; ++i)
 		{
@@ -2166,7 +2166,7 @@ class CContentLoot : public CContentObjective
 	{
 		if (_Mode == lm_item)
 		{
-			numEntry = _Items.size();
+			numEntry = (uint32)_Items.size();
 			predef.resize(numEntry);
 			for (uint i=0; i<numEntry; ++i)
 			{
@@ -2179,7 +2179,7 @@ class CContentLoot : public CContentObjective
 		}
 		else if (_Mode == lm_mp)
 		{
-			numEntry = _Items.size();
+			numEntry = (uint32)_Items.size();
 			predef.resize(numEntry);
 			for (uint i=0; i<numEntry; ++i)
 			{
@@ -2282,7 +2282,7 @@ class CContentCraft : public CContentObjective
 
 	virtual void getPredefParam(uint32 &numEntry, CPhrase::TPredefParams &predef)
 	{
-		numEntry = _Items.size();
+		numEntry = (uint32)_Items.size();
 		predef.resize(numEntry);
 		for (uint i=0; i<numEntry; ++i)
 		{
@@ -2357,7 +2357,7 @@ class CContentTarget : public CContentObjective
 
 		if (!_Npcs.empty())
 		{
-			numEntry = _Npcs.size();
+			numEntry = (uint32)_Npcs.size();
 			predef.resize(numEntry);
 			for (uint i=0; i<numEntry; ++i)
 			{
@@ -2370,7 +2370,7 @@ class CContentTarget : public CContentObjective
 		}
 		else if (!_Faunas.empty())
 		{
-			numEntry = _Faunas.size();
+			numEntry = (uint32)_Faunas.size();
 			predef.resize(numEntry);
 			for (uint i=0; i<numEntry; ++i)
 			{
@@ -2383,7 +2383,7 @@ class CContentTarget : public CContentObjective
 		}
 		else if (!_Races.empty())
 		{
-			numEntry = _Races.size();
+			numEntry = (uint32)_Races.size();
 			predef.resize(numEntry);
 			for (uint i=0; i<numEntry; ++i)
 			{
@@ -2486,7 +2486,7 @@ class CContentSell : public CContentObjective
 
 	virtual void getPredefParam(uint32 &numEntry, CPhrase::TPredefParams &predef)
 	{
-		numEntry = _Items.size();
+		numEntry = (uint32)_Items.size();
 		predef.resize(numEntry);
 		for (uint i=0; i<numEntry; ++i)
 		{
@@ -2571,7 +2571,7 @@ class CContentBuy : public CContentObjective
 
 	virtual void getPredefParam(uint32 &numEntry, CPhrase::TPredefParams &predef)
 	{
-		numEntry = _Items.size();
+		numEntry = (uint32)_Items.size();
 		predef.resize(numEntry);
 		for (uint i=0; i<numEntry; ++i)
 		{
@@ -2653,7 +2653,7 @@ class CContentGive : public CContentObjective
 
 	virtual void getPredefParam(uint32 &numEntry, CPhrase::TPredefParams &predef)
 	{
-		numEntry = _Items.size();
+		numEntry = (uint32)_Items.size();
 		predef.resize(numEntry);
 		for (uint i=0; i<numEntry; ++i)
 		{
@@ -2882,7 +2882,7 @@ class CContentSkill: public CContentObjective
 
 	virtual void getPredefParam(uint32 &numEntry, CPhrase::TPredefParams &predef)
 	{
-		numEntry = _Skills.size();
+		numEntry = (uint32)_Skills.size();
 		predef.resize(numEntry);
 
 		for (uint i=0; i<numEntry; ++i)

code/ryzom/tools/leveldesign/mp_generator/main.cpp

@@ -304,7 +304,7 @@ void GetItemColor( int color, char eco, int level, CSString& outStr )
 
 bool endsWith( const CSString& s, const CSString& substring )
 {
-	return (s.right( substring.size() ) == substring);
+	return (s.right( (uint)substring.size() ) == substring);
 }
 
 

code/ryzom/tools/leveldesign/mp_generator/utils.h

@@ -143,7 +143,7 @@ public:
 		{
 			for ( std::vector<std::string>::const_iterator ik=item.Fields[c].begin(); ik!=item.Fields[c].end(); ++ik )
 			{
-				_Indices[c].insert( make_pair( *ik, _Items.size()-1 ) );
+				_Indices[c].insert( make_pair( *ik, (uint32)_Items.size()-1 ) );
 			}
 		}
 	}

code/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp

@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
 	// Add the search paths
 	CConfigFile::CVar &sp = cf.getVar("SearchPath");
 
-	for (int i=0; i<sp.size(); ++i)
+	for (uint i=0; i<sp.size(); ++i)
 	{
 		CPath::addSearchPath(sp.asString(i), true, false);
 	}
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 
 	// parse the index file
 	CConfigFile::CVar &fl = indexFile.getVar("Files");
-	for (int i=0; i<(fl.size())/2; i++)
+	for (uint i=0; i<(fl.size())/2; i++)
 	{
 		string fileName;
 		uint32 index;
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 	}
 
 	// scan the search path
-	for (int i=0; i<ext.size(); ++i)
+	for (uint i=0; i<ext.size(); ++i)
 	{
 		vector<string> files;
 		CPath::getFileList(ext.asString(i), files);
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 				// check the first on full path
 				bool filtered = false;
 				string path = CPath::lookup(fileName);
-				for (int i=0; i<filters.size(); ++i)
+				for (uint i=0; i<filters.size(); ++i)
 				{
 					if (path.find(filters.asString(i)) != string::npos)
 					{

code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp

@@ -1889,7 +1889,7 @@ void CExport::cutZone (NL3D::CZone &bigZone, NL3D::CZone &bigZoneNoHeightmap, NL
 			PatchTransfered[i] = true;
 			DstPI.push_back (rPI);
 			DstPINoHeightmap.push_back (rPINoHeightmap);
-			OldToNewPatchId.insert (pair<int,int>(i, DstPI.size()-1));
+			OldToNewPatchId.insert (pair<int,int>(i, (int)DstPI.size()-1));
 		}
 	}
 
@@ -1940,7 +1940,7 @@ void CExport::cutZone (NL3D::CZone &bigZone, NL3D::CZone &bigZoneNoHeightmap, NL
 									PatchTransfered[i] = true;
 									DstPI.push_back (rPI);
 									DstPINoHeightmap.push_back (rPINoHeightmap);
-									OldToNewPatchId.insert (pair<int,int>(i, DstPI.size()-1));
+									OldToNewPatchId.insert (pair<int,int>(i, (int)DstPI.size()-1));
 									foundOne = true;
 									break;
 								}
@@ -1956,7 +1956,7 @@ void CExport::cutZone (NL3D::CZone &bigZone, NL3D::CZone &bigZoneNoHeightmap, NL
 	while (foundOne);
 
 	// Add all patch that are binded to one of those of the DstPI list 
-	uint32 nPreviousDstPISize = DstPI.size();
+	uint32 nPreviousDstPISize = (uint32)DstPI.size();
 	for (;;)
 	{
 		for (i = 0; i < DstPI.size(); ++i)
@@ -1977,7 +1977,7 @@ void CExport::cutZone (NL3D::CZone &bigZone, NL3D::CZone &bigZoneNoHeightmap, NL
 						}
 						DstPI.push_back (rPITmp);
 						DstPINoHeightmap.push_back (rPITmpNoHeightmap);
-						OldToNewPatchId.insert (pair<int,int>(next, DstPI.size()-1));
+						OldToNewPatchId.insert (pair<int,int>(next, (int)DstPI.size()-1));
 						PatchTransfered[next] = true;
 					}
 				}
@@ -1998,7 +1998,7 @@ void CExport::cutZone (NL3D::CZone &bigZone, NL3D::CZone &bigZoneNoHeightmap, NL
 							}
 							DstPI.push_back (rPITmp);
 							DstPINoHeightmap.push_back (rPITmpNoHeightmap);
-							OldToNewPatchId.insert (pair<int,int>(next, DstPI.size()-1));
+							OldToNewPatchId.insert (pair<int,int>(next, (int)DstPI.size()-1));
 							PatchTransfered[next] = true;
 						}
 					}
@@ -2009,7 +2009,7 @@ void CExport::cutZone (NL3D::CZone &bigZone, NL3D::CZone &bigZoneNoHeightmap, NL
 		// Do it until no more patch added
 		if (nPreviousDstPISize == DstPI.size())
 			break;
-		nPreviousDstPISize = DstPI.size();
+		nPreviousDstPISize = (uint32)DstPI.size();
 	}
 
 	for (i = 0; i < DstPI.size(); ++i)