diff options
| author |  Rohit Nirmal <rohitnirmal9@gmail.com> | 2015-01-30 19:20:34 +0000 |
|---|---|---|
| committer | Rohit Nirmal <rohitnirmal9@gmail.com> | 2015-01-30 19:20:34 +0000 |
| commit | 5ebf35db9601b12c7142641cc5635da32537171b (patch) | |
| tree | e60f7703e567a79cd928b4b6aa2800f5221bd248 | |
| parent | 28702cbfeb1fe21109f8b1efa189785594319b78 (diff) | |
Silence a few warnings.
| -rw-r--r-- | src/citra_qt/debugger/graphics_framebuffer.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/util/spinbox.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/elf.cpp | 4 |
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 a9423d6c..43c59738 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) void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value) { - if (framebuffer_height != new_value) { - framebuffer_height = new_value; + if (framebuffer_height != static_cast<unsigned>(new_value)) { + framebuffer_height = static_cast<unsigned>(new_value); framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom)); emit Update(); diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp index 54f628e4..1e3767c1 100644 --- a/src/citra_qt/util/spinbox.cpp +++ b/src/citra_qt/util/spinbox.cpp @@ -36,7 +36,7 @@ #include "spinbox.h" -CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), base(10), min_value(-100), max_value(100), value(0), num_digits(0) +CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), min_value(-100), max_value(100), value(0), base(10), num_digits(0) { // TODO: Might be nice to not immediately call the slot. // 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 e7e5df40..773eaf77 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -212,7 +212,7 @@ public: return GetPtr(segments[segment].p_offset); } u32 GetSectionAddr(SectionID section) const { return sectionAddrs[section]; } - int GetSectionSize(SectionID section) const { return sections[section].sh_size; } + unsigned int GetSectionSize(SectionID section) const { return sections[section].sh_size; } SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found bool DidRelocate() const { @@ -298,7 +298,7 @@ bool ElfReader::LoadSymbols() { //We have a symbol table! Elf32_Sym* symtab = (Elf32_Sym *)(GetSectionDataPtr(sec)); - int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym); + unsigned int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym); for (unsigned sym = 0; sym < numSymbols; sym++) { int size = symtab[sym].st_size; if (size == 0) |