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

DiscIO: cleanup warnings of -Wmaybe-uninitialized 

replace {} with std::nullopt.
This commit is contained in:
Jun Su 2020-03-23 14:14:00 +08:00
parent 62707986b7
commit d44c51b30c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DiscIO/DiscExtractor.cpp
View File

@ -266,7 +266,7 @@ std::optional<u64> GetBootDOLOffset(const Volume& volume, const Partition& parti
{
const Platform volume_type = volume.GetVolumeType();
if (!IsDisc(volume_type))
return {};
return std::nullopt;
std::optional<u64> dol_offset = volume.ReadSwappedAndShifted(0x420, partition);
@ -280,7 +280,7 @@ std::optional<u64> GetBootDOLOffset(const Volume& volume, const Partition& parti
std::optional<u32> GetBootDOLSize(const Volume& volume, const Partition& partition, u64 dol_offset)
{
if (!IsDisc(volume.GetVolumeType()))
return {};
return std::nullopt;
u32 dol_size = 0;
@ -326,7 +326,7 @@ std::optional<u64> GetFSTOffset(const Volume& volume, const Partition& partition
{
const Platform volume_type = volume.GetVolumeType();
if (!IsDisc(volume_type))
return {};
return std::nullopt;
return volume.ReadSwappedAndShifted(0x424, partition);
}
@ -335,7 +335,7 @@ std::optional<u64> GetFSTSize(const Volume& volume, const Partition& partition)
{
const Platform volume_type = volume.GetVolumeType();
if (!IsDisc(volume_type))
return {};
return std::nullopt;
return volume.ReadSwappedAndShifted(0x428, partition);
}