From ef060ed40c009c4d7b46a0979aa99c117861bc21 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 12 Nov 2019 04:45:21 -0500 Subject: [PATCH] result: Add default error code for the ResultCode(-1) case Will be used to reduce the overall duplication of the same magic value all over the codebase in following changes. --- src/core/hle/result.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 500ea882c0..450f61feac 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -146,6 +146,14 @@ constexpr bool operator!=(const ResultCode& a, const ResultCode& b) { /// The default success `ResultCode`. constexpr ResultCode RESULT_SUCCESS(0); +/** + * Placeholder result code used for unknown error codes. + * + * @note This should only be used when a particular error code + * is not known yet. + */ +constexpr ResultCode RESULT_UNKNOWN(UINT32_MAX); + /** * This is an optional value type. It holds a `ResultCode` and, if that code is a success code, * also holds a result of type `T`. If the code is an error code then trying to access the inner @@ -183,7 +191,7 @@ class ResultVal { public: /// Constructs an empty `ResultVal` with the given error code. The code must not be a success /// code. - ResultVal(ResultCode error_code = ResultCode(UINT32_MAX)) : result_code(error_code) { + ResultVal(ResultCode error_code = RESULT_UNKNOWN) : result_code(error_code) { ASSERT(error_code.IsError()); }