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

GCMemcard: Mark class constructors explicit where applicable 

Prevents potential implicit instantation.
This commit is contained in:
Lioncash 2017-03-08 19:00:06 -05:00
parent 883bec873f
commit 40cdd32760
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/HW/GCMemcard.h
View File

@ -70,7 +70,7 @@ enum
class MemoryCardBase class MemoryCardBase
{ {
public: public:
MemoryCardBase(int _card_index = 0, int sizeMb = MemCard2043Mb) explicit MemoryCardBase(int _card_index = 0, int sizeMb = MemCard2043Mb)
: card_index(_card_index), nintendo_card_id(sizeMb) : card_index(_card_index), nintendo_card_id(sizeMb)
{ {
} }
@ -132,7 +132,7 @@ struct Header // Offset Size Description
// Nintendo format algorithm. // Nintendo format algorithm.
// Constants are fixed by the GC SDK // Constants are fixed by the GC SDK
// Changing the constants will break memory card support // Changing the constants will break memory card support
Header(int slot = 0, u16 sizeMb = MemCard2043Mb, bool shift_jis = false) explicit Header(int slot = 0, u16 sizeMb = MemCard2043Mb, bool shift_jis = false)
{ {
memset(this, 0xFF, BLOCK_SIZE); memset(this, 0xFF, BLOCK_SIZE);
*(u16*)SizeMb = BE16(sizeMb); *(u16*)SizeMb = BE16(sizeMb);
@ -245,7 +245,7 @@ struct BlockAlloc
u16 NextFreeBlock(u16 MaxBlock, u16 StartingBlock = MC_FST_BLOCKS) const; u16 NextFreeBlock(u16 MaxBlock, u16 StartingBlock = MC_FST_BLOCKS) const;
bool ClearBlocks(u16 StartingBlock, u16 Length); bool ClearBlocks(u16 StartingBlock, u16 Length);
void fixChecksums() { calc_checksumsBE((u16*)&UpdateCounter, 0xFFE, &Checksum, &Checksum_Inv); } void fixChecksums() { calc_checksumsBE((u16*)&UpdateCounter, 0xFFE, &Checksum, &Checksum_Inv); }
BlockAlloc(u16 sizeMb = MemCard2043Mb) explicit BlockAlloc(u16 sizeMb = MemCard2043Mb)
{ {
memset(this, 0, BLOCK_SIZE); memset(this, 0, BLOCK_SIZE);
// UpdateCounter = 0; // UpdateCounter = 0;
@ -315,7 +315,8 @@ private:
void InitDirBatPointers(); void InitDirBatPointers();
public: public:
GCMemcard(const std::string& fileName, bool forceCreation = false, bool shift_jis = false); explicit GCMemcard(const std::string& fileName, bool forceCreation = false,
bool shift_jis = false);
bool IsValid() const { return m_valid; } bool IsValid() const { return m_valid; }
bool IsShiftJIS() const; bool IsShiftJIS() const;
bool Save(); bool Save();