diff options
| author | Marcus Wanners <marcus@wanners.net> | 2009-03-05 15:16:50 +0000 |
|---|---|---|
| committer | Marcus Wanners <marcus@wanners.net> | 2009-03-05 15:16:50 +0000 |
| commit | 432ea89b49b59b5b19b3c4ba579599d78ef278e7 (patch) | |
| tree | 4ae6b6e1b1ce244b16d18e371e4f2e11a916864a /Source/Core/DiscIO/Src/NANDContentLoader.cpp | |
| parent | cb121dab6696bf31a85d80dc824c0a390bb8ef79 (diff) | |
Compiler Warnings: Mismatch edition. Also fixed some conversion warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2557 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/NANDContentLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/NANDContentLoader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index 6e7a9ed578..44045f5d6e 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -106,8 +106,8 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath) return false;
}
u64 Size = File::GetSize(TMDFileName.c_str());
- u8* pTMD = new u8[Size];
- fread(pTMD, Size, 1, pTMDFile);
+ u8* pTMD = new u8[unsigned int(Size)];
+ fread(pTMD, size_t(Size), 1, pTMDFile);
fclose(pTMDFile);
//////
@@ -135,11 +135,11 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath) if (pFile != NULL)
{
u64 Size = File::GetSize(szFilename);
- rContent.m_pData = new u8[Size];
+ rContent.m_pData = new u8[unsigned int(Size)];
_dbg_assert_msg_(BOOT, rContent.m_Size==Size, "TMDLoader: Filesize doesnt fit (%s %i)", szFilename, i);
- fread(rContent.m_pData, Size, 1, pFile);
+ fread(rContent.m_pData, size_t(Size), 1, pFile);
fclose(pFile);
} else {
ERROR_LOG(DISCIO, "CreateFromDirectory: error opening %s",
|