summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/MultithreadedCompressor.h
diff options
context:
space:
mode:
authoriwubcode <iwubcode@users.noreply.github.com>2026-01-17 22:33:15 -0600
committerGitHub <noreply@github.com>2026-01-17 22:33:15 -0600
commit373e35ed5b3202bd91c05f6dd1f49fcee449d2a5 (patch)
tree76ecd3a69df3040ea2eba5624a3c8142248a44c3 /Source/Core/DiscIO/MultithreadedCompressor.h
parent6d40f4e897035211be746ea42e6388f384822ad9 (diff)
parentdffc7a650d06e3f6cdce019ca79098cfd1e2ed15 (diff)
Merge pull request #14267 from jordan-woyak/std-expected
Common: Replace Result with std::expected.
Diffstat (limited to 'Source/Core/DiscIO/MultithreadedCompressor.h')
-rw-r--r--Source/Core/DiscIO/MultithreadedCompressor.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/MultithreadedCompressor.h b/Source/Core/DiscIO/MultithreadedCompressor.h
index 6019d5472b..5afaa1cca5 100644
--- a/Source/Core/DiscIO/MultithreadedCompressor.h
+++ b/Source/Core/DiscIO/MultithreadedCompressor.h
@@ -4,6 +4,7 @@
#pragma once
#include <atomic>
+#include <expected>
#include <functional>
#include <memory>
#include <thread>
@@ -11,7 +12,6 @@
#include "Common/Assert.h"
#include "Common/Event.h"
-#include "Common/Result.h"
namespace DiscIO
{
@@ -25,7 +25,7 @@ enum class ConversionResultCode
};
template <typename T>
-using ConversionResult = Common::Result<T, ConversionResultCode>;
+using ConversionResult = std::expected<T, ConversionResultCode>;
// This class starts a number of compression threads and one output thread.
// The set_up_compress_thread_state function is called at the start of each compression thread.
@@ -165,7 +165,7 @@ private:
}
else
{
- SetError(result.Error());
+ SetError(result.error());
}
state->compress_done_event.Set();