diff options
| author | JosJuice <josjuice@gmail.com> | 2020-03-23 18:10:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 18:10:36 +0100 |
| commit | eca6cc51f977ceaae7a12883a5b7a587ee0d45f6 (patch) | |
| tree | a5c987683a2166d0e1437b3f6cecfa43b51b6e5f /Source/Core/DiscIO/DiscExtractor.cpp | |
| parent | 62707986b7c5c70f34767e70ddf06baf0b14a7c7 (diff) | |
| parent | d44c51b30c97b20112a8da3530bd70fa21d5898a (diff) | |
Merge pull request #8690 from howard0su/warning_discio
DiscIO: cleanup warnings of -Wmaybe-uninitialized
Diffstat (limited to 'Source/Core/DiscIO/DiscExtractor.cpp')
| -rw-r--r-- | Source/Core/DiscIO/DiscExtractor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/DiscExtractor.cpp b/Source/Core/DiscIO/DiscExtractor.cpp index 9ef3bd9d0a..3c2a67568d 100644 --- a/Source/Core/DiscIO/DiscExtractor.cpp +++ b/Source/Core/DiscIO/DiscExtractor.cpp @@ -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); } |
