From 66c6137eed52849585f4fdac0798f76387dcb801 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Thu, 23 Sep 2010 13:04:08 +0200
Subject: [PATCH] Changed: #1096 Build error with gcc (patch provided by
 abelgar)

---
 code/ryzom/tools/pd_parser/parse_node.h           |  4 ++--
 .../tools/translation_tools/extract_bot_names.cpp |  5 +++--
 .../translation_tools/extract_new_sheet_names.cpp |  3 ++-
 code/ryzom/tools/translation_tools/main.cpp       | 15 +++++++++------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/code/ryzom/tools/pd_parser/parse_node.h b/code/ryzom/tools/pd_parser/parse_node.h
index 63f94669f..7b5cb4dbb 100644
--- a/code/ryzom/tools/pd_parser/parse_node.h
+++ b/code/ryzom/tools/pd_parser/parse_node.h
@@ -689,9 +689,9 @@ public:
 		IsRef(false),
 		IsType(false),
 		IsKey(false),
+		Id(0),
 		Column(-1),
-		Columns(-1),
-		Id(0)
+		Columns(-1)
 	{
 	}
 
diff --git a/code/ryzom/tools/translation_tools/extract_bot_names.cpp b/code/ryzom/tools/translation_tools/extract_bot_names.cpp
index ea0f96747..0bfc6f6dc 100644
--- a/code/ryzom/tools/translation_tools/extract_bot_names.cpp
+++ b/code/ryzom/tools/translation_tools/extract_bot_names.cpp
@@ -272,8 +272,9 @@ int extractBotNames(int argc, char *argv[])
 	//-------------------------------------------------------------------
 	// init the sheets
 	CSheetId::init(false);
-	char *PACKED_SHEETS_NAME = "bin/translation_tools_creature.packed_sheets";
+	const string PACKED_SHEETS_NAME = "bin/translation_tools_creature.packed_sheets";
 	loadForm("creature", PACKED_SHEETS_NAME, Creatures, false, false);
+
 	if (Creatures.empty())
 	{
 		for (uint i=0;i<georgesPaths.size();++i)
@@ -750,4 +751,4 @@ int extractBotNames(int argc, char *argv[])
 	CI18N::writeTextFile(workTitleFile.asString(), s, false);
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp b/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
index 949d35f10..c923da503 100644
--- a/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
+++ b/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
@@ -198,7 +198,8 @@ void	extractNewWords(string workSheetFileName, string columnId, IWordListBuilder
 		return;
 	}
 	// get the key column index
-	uint	keyColIndex;
+	uint	keyColIndex = 0;
+	
 	if(!workSheet.findCol(columnId, keyColIndex))
 	{
 		nlwarning("Error: Don't find the column '%s'. '%s' Aborted", columnId.c_str(), workSheetFileName.c_str());
diff --git a/code/ryzom/tools/translation_tools/main.cpp b/code/ryzom/tools/translation_tools/main.cpp
index 75d0c18b5..7d7261588 100644
--- a/code/ryzom/tools/translation_tools/main.cpp
+++ b/code/ryzom/tools/translation_tools/main.cpp
@@ -313,7 +313,8 @@ int readLanguages()
 		LOG("Error : the file languages.txt is empty !\n");
 		return 1;
 	}
-	LOG("Found %u language code\n", Languages.size());
+
+	LOG("Found %u language code\n", (uint) Languages.size());
 
 	return 0;
 }
@@ -1378,7 +1379,7 @@ bool mergeWorksheetDiff(const std::string filename, TWorksheet &sheet, bool only
 			return false;
 		makeHashCode(diff, false);
 
-		uint cmdCol;
+		uint cmdCol = 0;
 		if (!diff.findCol(ucstring("DIFF_CMD"), cmdCol))
 		{
 			LOG("Can't find DIFF_CMD column in %s ! Invalid diff file.\n", CFile::getFilename(fileList[i]).c_str());
@@ -1490,7 +1491,7 @@ public:
 		TWorksheet::TRow row(context.Reference.ColCount+1);
 		for (uint j=0; j<context.Addition.ColCount; ++j)
 		{
-			uint colIndex;
+			uint colIndex = 0;
 			if (context.Reference.findCol(context.Addition.Data[0][j], colIndex))
 			{
 				row[colIndex+1] = context.Addition.Data[addIndex][j];
@@ -1508,7 +1509,7 @@ public:
 		TWorksheet::TRow row(context.Reference.ColCount+1);
 		for (uint j=0; j<context.Reference.ColCount; ++j)
 		{
-			uint colIndex;
+			uint colIndex = 0;
 			if (context.Reference.findCol(context.Reference.Data[0][j], colIndex))
 			{
 				row[colIndex+1] = context.Reference.Data[refIndex][j];
@@ -1527,15 +1528,17 @@ public:
 		// copy the old content (this fill data in column that don't exist in addition worksheet)
 		row = context.Reference.Data[refIndex];
 		row.insert(row.begin(), ucstring());
+
 		// changed element
 		for (uint j=0; j<context.Addition.ColCount; ++j)
 		{
-			uint colIndex;
+			uint colIndex = 0;
 			if (context.Reference.findCol(context.Addition.Data[0][j], colIndex))
 			{
 				row[colIndex+1] = context.Addition.Data[addIndex][j];
 			}
 		}
+
 		char temp[1024];
 		sprintf(temp, "DIFF CHANGED %u ", addIndex);
 		row[0] = temp;
@@ -3144,7 +3147,7 @@ int main(int argc, char *argv[])
 	
 	// create the diff version.
 	char temp[1024];
-	sprintf(temp, "%8.8X", ::time(NULL));
+	sprintf(temp, "%8.8X", (uint) ::time(NULL));
 	diffVersion = temp;
 
 	if (strcmp(argv[1], "make_work") == 0)