some more warning cleanup.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1999 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox
2009-01-24 01:50:23 +00:00
parent 8f98f0b778
commit fb3e523401
8 changed files with 58 additions and 16 deletions

View File

@ -200,7 +200,7 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="comctl32.lib rpcrt4.lib"
AdditionalDependencies="rpcrt4.lib"
/>
<Tool
Name="VCALinkTool"
@ -464,6 +464,14 @@
<File
RelativePath=".\resources\toolbar_add_breakpoint.c"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
@ -476,6 +484,14 @@
<File
RelativePath=".\resources\toolbar_add_memorycheck.c"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
@ -488,6 +504,14 @@
<File
RelativePath=".\resources\toolbar_delete.c"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
@ -500,6 +524,14 @@
<File
RelativePath=".\resources\toolbar_pause.c"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
@ -512,6 +544,14 @@
<File
RelativePath=".\resources\toolbar_play.c"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"

View File

@ -92,7 +92,7 @@ CARCFile::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBuffe
return(0);
}
memcpy(_pBuffer, &m_pBuffer[pFileInfo->m_Offset], pFileInfo->m_FileSize);
memcpy(_pBuffer, &m_pBuffer[pFileInfo->m_Offset], (size_t)pFileInfo->m_FileSize);
return((size_t) pFileInfo->m_FileSize);
}
@ -156,7 +156,7 @@ CARCFile::ParseBuffer()
if (Root.IsDirectory())
{
m_FileInfoVector.resize(Root.m_FileSize);
m_FileInfoVector.resize((unsigned int)Root.m_FileSize);
const char* szNameTable = (char*)(m_pBuffer + FSTOffset);
for (size_t i = 0; i < m_FileInfoVector.size(); i++)

View File

@ -187,7 +187,7 @@ bool CFileSystemGCWii::InitFileSystem()
PanicAlert("Wtf?");
u64 NameTableOffset = FSTOffset;
m_FileInfoVector.reserve(Root.m_FileSize);
m_FileInfoVector.reserve((unsigned int)Root.m_FileSize);
for (u32 i = 0; i < Root.m_FileSize; i++)
{
SFileInfo sfi;