izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14267 from jordan-woyak/std-expected

Browse Source 
Common: Replace Result with std::expected.
This commit is contained in:
iwubcode
2026-01-17 22:33:15 -06:00
committed by GitHub
parent 6d40f4e897 dffc7a650d
commit 373e35ed5b
24 changed files with 164 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DiscIO/WIABlob.cpp
+6 -5
View File
@@ -6,6 +6,7 @@
#include <algorithm>
#include <array>
#include <cstring>
#include <expected>
#include <limits>
#include <map>
#include <memory>
@@ -1578,7 +1579,7 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
if (state->compressor)
{
if (!state->compressor->Start(entry.exception_lists.size() + entry.main_data.size()))
return ConversionResultCode::InternalError;
return std::unexpected{ConversionResultCode::InternalError};
}
if (!entry.exception_lists.empty())
@@ -1588,7 +1589,7 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
if (!state->compressor->Compress(entry.exception_lists.data(),
entry.exception_lists.size()))
{
return ConversionResultCode::InternalError;
return std::unexpected{ConversionResultCode::InternalError};
}
}
else
@@ -1601,7 +1602,7 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
if (!state->compressor->AddPrecedingDataOnlyForPurgeHashing(entry.exception_lists.data(),
entry.exception_lists.size()))
{
return ConversionResultCode::InternalError;
return std::unexpected{ConversionResultCode::InternalError};
}
}
}
@@ -1610,9 +1611,9 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
if (state->compressor)
{
if (!state->compressor->Compress(entry.main_data.data(), entry.main_data.size()))
return ConversionResultCode::InternalError;
return std::unexpected{ConversionResultCode::InternalError};
if (!state->compressor->End())
return ConversionResultCode::InternalError;
return std::unexpected{ConversionResultCode::InternalError};
}
bool compressed = !!state->compressor;