From 8cb2443c2fe22196c26d6e15608273dbc9e6551f Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Mon, 9 May 2011 07:43:02 +0000 Subject: [PATCH] Fix non-Windows build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7533 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DiscIO/Src/NANDContentLoader.cpp | 4 ++-- Source/Core/DiscIO/Src/NANDContentLoader.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index 732e58511f..6ea48cc893 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -108,7 +108,7 @@ public: const SNANDContent* GetContentByIndex(int _Index) const; const u8* GetTMDView() const { return m_TMDView; } const u8* GetTMDHeader() const { return m_TMDHeader; } - const u32 GetTIKSize() const { return m_TIKSize; } + u32 GetTIKSize() const { return m_TIKSize; } const u8* GetTIK() const { return m_TIK; } const std::vector& GetContent() const { return m_Content; } @@ -534,7 +534,7 @@ u64 CNANDContentManager::Install_WiiWAD(std::string &fileName) File::IOFile pTicketFile(TicketFileName, "wb"); if (!pTicketFile) { - PanicAlertT("WAD installation failed: error creating %s", TicketFileName); + PanicAlertT("WAD installation failed: error creating %s", TicketFileName.c_str()); return 0; } diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.h b/Source/Core/DiscIO/Src/NANDContentLoader.h index 02fa4197ac..60aa553de6 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.h +++ b/Source/Core/DiscIO/Src/NANDContentLoader.h @@ -60,7 +60,7 @@ public: virtual const SNANDContent* GetContentByIndex(int _Index) const = 0; virtual const u8* GetTMDView() const = 0; virtual const u8* GetTMDHeader() const = 0; - virtual const u32 GetTIKSize() const = 0; + virtual u32 GetTIKSize() const = 0; virtual const u8* GetTIK() const = 0; virtual const std::vector& GetContent() const = 0; virtual u16 GetTitleVersion() const = 0;