From 0d2830f616b2e94ce658de92194773b4681ba534 Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 18 Jun 2015 03:05:16 +0000 Subject: [PATCH] bsnes - fix inexplicable errors with non-void functions returning nothing on some codepaths --- libsnes/bsnes/snes/chip/armdsp/registers.hpp | 1 + libsnes/bsnes/snes/chip/icd2/interface/interface.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libsnes/bsnes/snes/chip/armdsp/registers.hpp b/libsnes/bsnes/snes/chip/armdsp/registers.hpp index d0d3288720..f7e4e30b6e 100644 --- a/libsnes/bsnes/snes/chip/armdsp/registers.hpp +++ b/libsnes/bsnes/snes/chip/armdsp/registers.hpp @@ -93,6 +93,7 @@ struct Register { Register& operator=(uint32 n) { data = n; if(write) write(); + return *this; } Register& operator+=(uint32 n) { return operator=(data + n); } diff --git a/libsnes/bsnes/snes/chip/icd2/interface/interface.cpp b/libsnes/bsnes/snes/chip/icd2/interface/interface.cpp index b0cebdef9a..8f2a16f42b 100644 --- a/libsnes/bsnes/snes/chip/icd2/interface/interface.cpp +++ b/libsnes/bsnes/snes/chip/icd2/interface/interface.cpp @@ -112,7 +112,7 @@ bool ICD2::inputPoll(unsigned id) { return 0; } -void* ICD2::allocSharedMemory(const char* memtype, size_t amt, int initialByte) { SNES::interface()->allocSharedMemory(memtype, amt, initialByte); } +void* ICD2::allocSharedMemory(const char* memtype, size_t amt, int initialByte) { return SNES::interface()->allocSharedMemory(memtype, amt, initialByte); } void ICD2::freeSharedMemory(void* ptr) { SNES::interface()->freeSharedMemory(ptr); } #endif