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

DiscIO: make use of std::nullopt 

This also fixes a bogus GCC warning.
This commit is contained in:
Tillmann Karras 2020-08-01 01:28:21 +01:00
parent d2b06f4786
commit ca61b6c1ab
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/DiscIO/Volume.h
View File

@ -58,15 +58,20 @@ public:
std::optional<u64> ReadSwappedAndShifted(u64 offset, const Partition& partition) const std::optional<u64> ReadSwappedAndShifted(u64 offset, const Partition& partition) const
{ {
const std::optional<u32> temp = ReadSwapped<u32>(offset, partition); const std::optional<u32> temp = ReadSwapped<u32>(offset, partition);
return temp ? static_cast<u64>(*temp) << GetOffsetShift() : std::optional<u64>(); if (!temp)
return std::nullopt;
return static_cast<u64>(*temp) << GetOffsetShift();
} }
virtual bool IsEncryptedAndHashed() const { return false; } virtual bool IsEncryptedAndHashed() const { return false; }
virtual std::vector<Partition> GetPartitions() const { return {}; } virtual std::vector<Partition> GetPartitions() const { return {}; }
virtual Partition GetGamePartition() const { return PARTITION_NONE; } virtual Partition GetGamePartition() const { return PARTITION_NONE; }
virtual std::optional<u32> GetPartitionType(const Partition& partition) const { return {}; } virtual std::optional<u32> GetPartitionType(const Partition& partition) const
{
return std::nullopt;
}
std::optional<u64> GetTitleID() const { return GetTitleID(GetGamePartition()); } std::optional<u64> GetTitleID() const { return GetTitleID(GetGamePartition()); }
virtual std::optional<u64> GetTitleID(const Partition& partition) const { return {}; } virtual std::optional<u64> GetTitleID(const Partition& partition) const { return std::nullopt; }
virtual const IOS::ES::TicketReader& GetTicket(const Partition& partition) const virtual const IOS::ES::TicketReader& GetTicket(const Partition& partition) const
{ {
return INVALID_TICKET; return INVALID_TICKET;