Silence some compiler warnings that have accumulated.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6211 8ced0084-cf51-0410-be5f-012b33b47a6e

6 files changed, 9 insertions, 9 deletions

diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp
index f9d2221e44..3f0807e206 100644
--- a/Source/Core/Core/Src/CoreParameter.cpp
+++ b/Source/Core/Core/Src/CoreParameter.cpp
@@ -46,9 +46,9 @@ SCoreStartupParameter::SCoreStartupParameter()
   bHLE_BS2(true), bUseFastMem(false),
   bLockThreads(false),
   bEnableCheats(false),
+  bMergeBlocks(false),
   bRunCompareServer(false), bRunCompareClient(false),
   bMMU(false), bMMUBAT(false), iTLBHack(0), bAlternateRFI(false),
-  bMergeBlocks(false),
   SelectedLanguage(0), bWii(false),
   bConfirmStop(false), bHideCursor(false), 
   bAutoHideCursor(false), bUsePanicHandlers(true),
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
index b084efabef..e8d492c69b 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
@@ -482,7 +482,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 				FILE* pFile = fopen(TicketFilename.c_str(), "rb");
 				if (pFile)
 				{
-					int View = 0;
+					unsigned int View = 0;
 					u8 Ticket[SIZE_OF_ONE_TICKET];
 					while (View < maxViews && fread(Ticket, SIZE_OF_ONE_TICKET, 1, pFile) == 1)
 					{
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
index e7d4ed3c43..ffc455f524 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
@@ -498,7 +498,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
 	js.downcountAmount = 0;
 	if (!Core::g_CoreStartupParameter.bEnableDebugging)
 	{
-		for (int i = 0; i < merged_addresses.size(); ++i)
+		for (unsigned int i = 0; i < merged_addresses.size(); ++i)
 		{
 			const u32 address = merged_addresses[i];
 			js.downcountAmount += PatchEngine::GetSpeedhackCycles(address);
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
index da0f5eb51b..2650d2a64f 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
@@ -472,7 +472,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
 	js.downcountAmount = 0;
 	if (!Core::g_CoreStartupParameter.bEnableDebugging)
 	{
-		for (int i = 0; i < merged_addresses.size(); ++i)
+		for (unsigned int i = 0; i < merged_addresses.size(); ++i)
 		{
 			const u32 address = merged_addresses[i];
 			js.downcountAmount += PatchEngine::GetSpeedhackCycles(address);
diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
index d3cc9dafe2..e87ba79e1d 100644
--- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
@@ -434,7 +434,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, Bloc
 			}
 
 			bool follow = false;
-			u32 destination;
+			u32 destination = 0;
 			if (inst.OPCD == 18 && blockSize > 1)
 			{
 				//Is bx - should we inline? yes!
diff --git a/Source/Core/VideoCommon/Src/DLCache.cpp b/Source/Core/VideoCommon/Src/DLCache.cpp
index 934de5f0c0..009c27dd97 100644
--- a/Source/Core/VideoCommon/Src/DLCache.cpp
+++ b/Source/Core/VideoCommon/Src/DLCache.cpp
@@ -88,16 +88,16 @@ struct CachedDisplayList
 {
 	CachedDisplayList()
 			: uncachable(false),
-			pass(DLPASS_ANALYZE),
-			next_check(1),
 			num_xf_reg(0),
 			num_cp_reg(0),
 			num_bp_reg(0), 
 			num_index_xf(0),
 			num_draw_call(0),
+			pass(DLPASS_ANALYZE),
+			next_check(1),
+			BufferCount(0),
 			Regions(NULL),
-			LastRegion(NULL),
-			BufferCount(0)
+			LastRegion(NULL)
 	{
 		frame_count = frameCount;
 	}