From d44c51b30c97b20112a8da3530bd70fa21d5898a Mon Sep 17 00:00:00 2001 From: Jun Su Date: Mon, 23 Mar 2020 14:14:00 +0800 Subject: [PATCH] DiscIO: cleanup warnings of -Wmaybe-uninitialized replace {} with std::nullopt. --- Source/Core/DiscIO/DiscExtractor.cpp | 8 ++++---- 1 file 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 GetBootDOLOffset(const Volume& volume, const Partition& parti { const Platform volume_type = volume.GetVolumeType(); if (!IsDisc(volume_type)) - return {}; + return std::nullopt; std::optional dol_offset = volume.ReadSwappedAndShifted(0x420, partition); @@ -280,7 +280,7 @@ std::optional GetBootDOLOffset(const Volume& volume, const Partition& parti std::optional 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 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 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); }