From 5f6a2e498a01b173111e72d77215a9fde12721cc Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 27 Apr 2014 20:17:22 -0700 Subject: [PATCH] Fix some type comparion warnings. --- rpcs3/Emu/Audio/AL/OpenALThread.h | 2 +- rpcs3/Emu/Cell/PPUProgramCompiler.cpp | 6 +++--- rpcs3/Gui/MemoryViewer.cpp | 2 +- rpcs3/Gui/MemoryViewer.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/Audio/AL/OpenALThread.h b/rpcs3/Emu/Audio/AL/OpenALThread.h index cf65d31919..424b3e2a6e 100644 --- a/rpcs3/Emu/Audio/AL/OpenALThread.h +++ b/rpcs3/Emu/Audio/AL/OpenALThread.h @@ -12,7 +12,7 @@ private: ALuint m_buffers[g_al_buffers_count]; ALCdevice* m_device; ALCcontext* m_context; - u32 m_buffer_size; + ALsizei m_buffer_size; public: ~OpenALThread(); diff --git a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp index 4120c81372..5c1dd9bf7a 100644 --- a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp +++ b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp @@ -44,7 +44,7 @@ s64 FindOp(const std::string& text, const std::string& op, s64 from) { if (text.length() < op.length()) return -1; - for (s64 i = from; i= m_asm.length(); } -bool CompilePPUProgram::IsEndLn(const char c) const { return c == '\n' || p - 1 >= m_asm.length(); } +bool CompilePPUProgram::IsEnd() const { return p >= (s64)m_asm.length(); } +bool CompilePPUProgram::IsEndLn(const char c) const { return c == '\n' || p - 1 >= (s64)m_asm.length(); } char CompilePPUProgram::NextChar() { return *m_asm.substr(p++, 1).c_str(); } void CompilePPUProgram::NextLn() { while( !IsEndLn(NextChar()) ); if(!IsEnd()) m_line++; } diff --git a/rpcs3/Gui/MemoryViewer.cpp b/rpcs3/Gui/MemoryViewer.cpp index 90e36a0175..7fdaff14cb 100644 --- a/rpcs3/Gui/MemoryViewer.cpp +++ b/rpcs3/Gui/MemoryViewer.cpp @@ -210,7 +210,7 @@ void MemoryViewerPanel::ShowMemory() t_mem_ascii->SetValue(t_mem_ascii_str); } -void MemoryViewerPanel::ShowImage(wxWindow* parent, u32 addr, int mode, int width, int height, bool flipv) +void MemoryViewerPanel::ShowImage(wxWindow* parent, u32 addr, int mode, u32 width, u32 height, bool flipv) { wxString title = wxString::Format("Raw Image @ 0x%x", addr); diff --git a/rpcs3/Gui/MemoryViewer.h b/rpcs3/Gui/MemoryViewer.h index 2abfa66c94..3f73d368c4 100644 --- a/rpcs3/Gui/MemoryViewer.h +++ b/rpcs3/Gui/MemoryViewer.h @@ -41,5 +41,5 @@ public: void SetPC(const uint pc) { m_addr = pc; } //Static methods - static void ShowImage(wxWindow* parent, u32 addr, int mode, int sizex, int sizey, bool flipv); + static void ShowImage(wxWindow* parent, u32 addr, int mode, u32 sizex, u32 sizey, bool flipv); };