diff --git a/Externals/SDL/src/joystick/bsd/SDL_sysjoystick.c b/Externals/SDL/src/joystick/bsd/SDL_sysjoystick.c index 3cb300281a..dafade71ea 100644 --- a/Externals/SDL/src/joystick/bsd/SDL_sysjoystick.c +++ b/Externals/SDL/src/joystick/bsd/SDL_sysjoystick.c @@ -87,7 +87,7 @@ struct usb_ctl_report { struct report { struct usb_ctl_report *buf; /* Buffer */ - size_t size; /* Buffer size */ + ssize_t size; /* Buffer size */ int rid; /* Report ID */ enum { SREPORT_UNINIT, diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h index cdf831d1d9..ff19a18905 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h @@ -64,7 +64,7 @@ public: _size = _size + s; } void clear() { _size = 0; } - u8* const p() { return _buffer; } + u8* p() { return _buffer; } private: u8* _buffer; diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp index 213415a728..47fef6020c 100644 --- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp @@ -185,8 +185,8 @@ inline void ReadFromHardware(T &_var, u32 em_address, u32 effective_address, Mem { _var = bswap((*(const T*)&m_pL1Cache[em_address & L1_CACHE_MASK])); } - else if (bFakeVMEM && ((em_address &0xF0000000) == 0x70000000) || - bFakeVMEM && ((em_address &0xF0000000) == 0x40000000)) + else if ((bFakeVMEM && ((em_address &0xF0000000) == 0x70000000)) || + (bFakeVMEM && ((em_address &0xF0000000) == 0x40000000))) { // fake VMEM _var = bswap((*(const T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK])); @@ -287,8 +287,8 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, *(T*)&m_pL1Cache[em_address & L1_CACHE_MASK] = bswap(data); return; } - else if (bFakeVMEM && ((em_address &0xF0000000) == 0x70000000) || - bFakeVMEM && ((em_address &0xF0000000) == 0x40000000)) + else if ((bFakeVMEM && ((em_address &0xF0000000) == 0x70000000)) || + (bFakeVMEM && ((em_address &0xF0000000) == 0x40000000))) { // fake VMEM *(T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK] = bswap(data); diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index 3e7f6573ff..ae766af813 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -117,9 +117,9 @@ public: const std::vector& GetContent() const { return m_Content; } - const u16 GetTitleVersion() const {return m_TileVersion;} - const u16 GetNumEntries() const {return m_numEntries;} - const DiscIO::IVolume::ECountry GetCountry() const; + u16 GetTitleVersion() const {return m_TileVersion;} + u16 GetNumEntries() const {return m_numEntries;} + DiscIO::IVolume::ECountry GetCountry() const; private: @@ -333,7 +333,7 @@ bool CNANDContentLoader::ParseTMD(u8* pDataApp, u32 pDataAppSize, u8* pTicket, u return true; } -const DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const +DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const { if (!IsValid()) return DiscIO::IVolume::COUNTRY_UNKNOWN; diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.h b/Source/Core/DiscIO/Src/NANDContentLoader.h index 1dc1ad65c2..aae832774b 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.h +++ b/Source/Core/DiscIO/Src/NANDContentLoader.h @@ -59,9 +59,9 @@ public: virtual const u8* GetTicketView() const = 0; virtual const u8* GetTmdHeader() const = 0; virtual const std::vector& GetContent() const = 0; - virtual const u16 GetTitleVersion() const = 0; - virtual const u16 GetNumEntries() const = 0; - virtual const DiscIO::IVolume::ECountry GetCountry() const = 0; + virtual u16 GetTitleVersion() const = 0; + virtual u16 GetNumEntries() const = 0; + virtual DiscIO::IVolume::ECountry GetCountry() const = 0; enum { diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h b/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h index 3dc5e9dd3e..3a36a13307 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h @@ -96,7 +96,7 @@ public: { return *((&x) + i); } - const float operator [] (const int i) const + float operator [] (const int i) const { return *((&x) + i); }