diff options
author | bunnei <bunneidev@gmail.com> | 2015-02-19 19:45:58 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-02-19 19:45:58 +0100 |
commit | c7d1480ece78126801e308fd9a9a9a1664e34428 (patch) | |
tree | 614465509e7a8c6fe7a0b3d0f45a1c06e103c29e | |
parent | Merge pull request #585 from Subv/local_var (diff) | |
parent | Convert a few C stdlib asserts to Citra's own asserts (diff) | |
download | yuzu-c7d1480ece78126801e308fd9a9a9a1664e34428.tar yuzu-c7d1480ece78126801e308fd9a9a9a1664e34428.tar.gz yuzu-c7d1480ece78126801e308fd9a9a9a1664e34428.tar.bz2 yuzu-c7d1480ece78126801e308fd9a9a9a1664e34428.tar.lz yuzu-c7d1480ece78126801e308fd9a9a9a1664e34428.tar.xz yuzu-c7d1480ece78126801e308fd9a9a9a1664e34428.tar.zst yuzu-c7d1480ece78126801e308fd9a9a9a1664e34428.zip |
-rw-r--r-- | src/core/hle/result.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 9dbd5a914..0e391fe2d 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -4,7 +4,6 @@ #pragma once -#include <cassert> #include <cstddef> #include <type_traits> #include <utility> @@ -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 <typename... Args> 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<const T*>(static_cast<const void*>(&storage)); } T* GetPointer() { - assert(!empty()); + ASSERT(!empty()); return static_cast<T*>(static_cast<void*>(&storage)); } }; |