ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Silence some compiler warnings. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6029 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-08-01 16:14:35 +00:00
parent 4bef335632
commit fad075351c
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/SDL/src/joystick/bsd/SDL_sysjoystick.c vendored
View File

@ -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,

2
Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
View File

@ -64,7 +64,7 @@ public:
_size = _size + s;
}
void clear() { _size = 0; }
u8* const p() { return _buffer; }
u8* p() { return _buffer; }
private:
u8* _buffer;

8
Source/Core/Core/Src/HW/MemmapFunctions.cpp
View File

@ -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);

8
Source/Core/DiscIO/Src/NANDContentLoader.cpp
View File

@ -117,9 +117,9 @@ public:
const std::vector<SNANDContent>& 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;

6
Source/Core/DiscIO/Src/NANDContentLoader.h
View File

@ -59,9 +59,9 @@ public:
virtual const u8* GetTicketView() const = 0;
virtual const u8* GetTmdHeader() const = 0;
virtual const std::vector<SNANDContent>& 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
{

2
Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h
View File

@ -96,7 +96,7 @@ public:
{
return *((&x) + i);
}
const float operator [] (const int i) const
float operator [] (const int i) const
{
return *((&x) + i);
}