citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #514 from rohit-n/fix-warnings 

Silence a few warnings.
This commit is contained in:
bunnei 2015-02-01 00:31:06 -05:00
parent c8628f5d56 5ebf35db96
commit c915d0b727
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/citra_qt/debugger/graphics_framebuffer.cpp
View File

@ -170,8 +170,8 @@ void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value)
void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value) void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value)
{ {
if (framebuffer_height != new_value) { if (framebuffer_height != static_cast<unsigned>(new_value)) {
framebuffer_height = new_value; framebuffer_height = static_cast<unsigned>(new_value);
framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom)); framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom));
emit Update(); emit Update();

2
src/citra_qt/util/spinbox.cpp
View File

@ -36,7 +36,7 @@
#include "spinbox.h" #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. // 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 // Think of an address that is being replaced by a different one, in which case a lot

4
src/core/loader/elf.cpp
View File

@ -212,7 +212,7 @@ public:
return GetPtr(segments[segment].p_offset); return GetPtr(segments[segment].p_offset);
} }
u32 GetSectionAddr(SectionID section) const { return sectionAddrs[section]; } 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 SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found
bool DidRelocate() const { bool DidRelocate() const {
@ -298,7 +298,7 @@ bool ElfReader::LoadSymbols() {
//We have a symbol table! //We have a symbol table!
Elf32_Sym* symtab = (Elf32_Sym *)(GetSectionDataPtr(sec)); 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++) { for (unsigned sym = 0; sym < numSymbols; sym++) {
int size = symtab[sym].st_size; int size = symtab[sym].st_size;
if (size == 0) if (size == 0)