summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRohit Nirmal <rohitnirmal9@gmail.com>2015-01-30 20:20:34 +0100
committerRohit Nirmal <rohitnirmal9@gmail.com>2015-01-30 20:20:34 +0100
commit5ebf35db9601b12c7142641cc5635da32537171b (patch)
treee60f7703e567a79cd928b4b6aa2800f5221bd248 /src
parentMerge pull request #503 from yuriks/kernel-lifetime4 (diff)
downloadyuzu-5ebf35db9601b12c7142641cc5635da32537171b.tar
yuzu-5ebf35db9601b12c7142641cc5635da32537171b.tar.gz
yuzu-5ebf35db9601b12c7142641cc5635da32537171b.tar.bz2
yuzu-5ebf35db9601b12c7142641cc5635da32537171b.tar.lz
yuzu-5ebf35db9601b12c7142641cc5635da32537171b.tar.xz
yuzu-5ebf35db9601b12c7142641cc5635da32537171b.tar.zst
yuzu-5ebf35db9601b12c7142641cc5635da32537171b.zip
Diffstat (limited to '')
-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)
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 54f628e4c..1e3767c18 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 e7e5df408..773eaf771 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)