From 3c48697ea39aa5fbf477cf1f71fbd76a8c88f1db Mon Sep 17 00:00:00 2001 From: archshift Date: Wed, 18 Feb 2015 21:52:36 -0800 Subject: Convert a few C stdlib asserts to Citra's own asserts --- src/core/hle/result.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 9dbd5a91..0e391fe2 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -4,7 +4,6 @@ #pragma once -#include #include #include #include @@ -267,7 +266,7 @@ public: ResultVal(ResultCode error_code = ResultCode(-1)) : result_code(error_code) { - assert(error_code.IsError()); + ASSERT(error_code.IsError()); UpdateDebugPtr(); } @@ -330,7 +329,7 @@ public: */ template void emplace(ResultCode success_code, Args&&... args) { - assert(success_code.IsSuccess()); + ASSERT(success_code.IsSuccess()); if (!empty()) { GetPointer()->~T(); } @@ -362,7 +361,6 @@ public: /// Asserts that the result succeeded and returns a reference to it. T& Unwrap() { - // TODO(yuriks): Should be a release assert ASSERT_MSG(Succeeded(), "Tried to Unwrap empty ResultVal"); return **this; } @@ -389,12 +387,12 @@ private: } const T* GetPointer() const { - assert(!empty()); + ASSERT(!empty()); return static_cast(static_cast(&storage)); } T* GetPointer() { - assert(!empty()); + ASSERT(!empty()); return static_cast(static_cast(&storage)); } }; -- cgit v1.2.3