summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2015-02-01 00:31:06 -0500
committerGravatar bunnei2015-02-01 00:31:06 -0500
commitc915d0b727bf0beb22943ccd5b2a6dc7c7ac2803 (patch)
treebeb460de11181a617b910a0a9c272c0427975372 /src
parentMerge pull request #525 from lioncash/armwarn (diff)
parentSilence a few warnings. (diff)
downloadyuzu-c915d0b727bf0beb22943ccd5b2a6dc7c7ac2803.tar.gz
yuzu-c915d0b727bf0beb22943ccd5b2a6dc7c7ac2803.tar.xz
yuzu-c915d0b727bf0beb22943ccd5b2a6dc7c7ac2803.zip
Merge pull request #514 from rohit-n/fix-warnings
Silence a few warnings.
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/debugger/graphics_framebuffer.cpp4
-rw-r--r--src/citra_qt/util/spinbox.cpp2
-rw-r--r--src/core/loader/elf.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp
index a9423d6c7..43c59738f 100644
--- a/src/citra_qt/debugger/graphics_framebuffer.cpp
+++ b/src/citra_qt/debugger/graphics_framebuffer.cpp
@@ -170,8 +170,8 @@ void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value)
170 170
171void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value) 171void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value)
172{ 172{
173 if (framebuffer_height != new_value) { 173 if (framebuffer_height != static_cast<unsigned>(new_value)) {
174 framebuffer_height = new_value; 174 framebuffer_height = static_cast<unsigned>(new_value);
175 175
176 framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom)); 176 framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom));
177 emit Update(); 177 emit Update();
diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp
index 54f628e4c..1e3767c18 100644
--- a/src/citra_qt/util/spinbox.cpp
+++ b/src/citra_qt/util/spinbox.cpp
@@ -36,7 +36,7 @@
36 36
37#include "spinbox.h" 37#include "spinbox.h"
38 38
39CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), base(10), min_value(-100), max_value(100), value(0), num_digits(0) 39CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), min_value(-100), max_value(100), value(0), base(10), num_digits(0)
40{ 40{
41 // TODO: Might be nice to not immediately call the slot. 41 // TODO: Might be nice to not immediately call the slot.
42 // Think of an address that is being replaced by a different one, in which case a lot 42 // Think of an address that is being replaced by a different one, in which case a lot
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index e7e5df408..773eaf771 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -212,7 +212,7 @@ public:
212 return GetPtr(segments[segment].p_offset); 212 return GetPtr(segments[segment].p_offset);
213 } 213 }
214 u32 GetSectionAddr(SectionID section) const { return sectionAddrs[section]; } 214 u32 GetSectionAddr(SectionID section) const { return sectionAddrs[section]; }
215 int GetSectionSize(SectionID section) const { return sections[section].sh_size; } 215 unsigned int GetSectionSize(SectionID section) const { return sections[section].sh_size; }
216 SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found 216 SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found
217 217
218 bool DidRelocate() const { 218 bool DidRelocate() const {
@@ -298,7 +298,7 @@ bool ElfReader::LoadSymbols() {
298 298
299 //We have a symbol table! 299 //We have a symbol table!
300 Elf32_Sym* symtab = (Elf32_Sym *)(GetSectionDataPtr(sec)); 300 Elf32_Sym* symtab = (Elf32_Sym *)(GetSectionDataPtr(sec));
301 int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym); 301 unsigned int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym);
302 for (unsigned sym = 0; sym < numSymbols; sym++) { 302 for (unsigned sym = 0; sym < numSymbols; sym++) {
303 int size = symtab[sym].st_size; 303 int size = symtab[sym].st_size;
304 if (size == 0) 304 if (size == 0)