mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Merge pull request #13537 from tygyh/DiscIO-Make-variables-constexpr
DiscIO: Make variables constexpr
This commit is contained in:
@ -15,8 +15,8 @@ namespace DiscIO
|
||||
{
|
||||
static constexpr u32 CISO_MAGIC = 0x4F534943; // "CISO" (byteswapped to little endian)
|
||||
|
||||
static const u32 CISO_HEADER_SIZE = 0x8000;
|
||||
static const u32 CISO_MAP_SIZE = CISO_HEADER_SIZE - sizeof(u32) - sizeof(char) * 4;
|
||||
static constexpr u32 CISO_HEADER_SIZE = 0x8000;
|
||||
static constexpr u32 CISO_MAP_SIZE = CISO_HEADER_SIZE - sizeof(u32) - sizeof(char) * 4;
|
||||
|
||||
struct CISOHeader
|
||||
{
|
||||
@ -53,7 +53,7 @@ private:
|
||||
CISOFileReader(File::IOFile file);
|
||||
|
||||
typedef u16 MapType;
|
||||
static const MapType UNUSED_BLOCK_ID = UINT16_MAX;
|
||||
static constexpr MapType UNUSED_BLOCK_ID = UINT16_MAX;
|
||||
|
||||
File::IOFile m_file;
|
||||
u64 m_size;
|
||||
|
Reference in New Issue
Block a user