From 5dbf3888f4b1a47112b806d793ba33ef21e5492e Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 14 Jun 2022 01:55:11 +0200 Subject: [PATCH] early-access version 2778 --- README.md | 2 +- src/common/assert.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 72d1c53d0..2ff12f74b 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2777. +This is the source code for early-access 2778. ## Legal Notice diff --git a/src/common/assert.h b/src/common/assert.h index 95a503fb3..8c927fcc0 100755 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -14,13 +14,13 @@ void assert_fail_impl(); [[noreturn]] void unreachable_impl(); #ifdef _MSC_VER -#define NO_INLINE __declspec(noinline) +#define YUZU_NO_INLINE __declspec(noinline) #else -#define NO_INLINE __attribute__((noinline)) +#define YUZU_NO_INLINE __attribute__((noinline)) #endif #define ASSERT(_a_) \ - ([&]() NO_INLINE { \ + ([&]() YUZU_NO_INLINE { \ if (!(_a_)) [[unlikely]] { \ LOG_CRITICAL(Debug, "Assertion Failed!"); \ assert_fail_impl(); \ @@ -28,7 +28,7 @@ void assert_fail_impl(); }()) #define ASSERT_MSG(_a_, ...) \ - ([&]() NO_INLINE { \ + ([&]() YUZU_NO_INLINE { \ if (!(_a_)) [[unlikely]] { \ LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); \ assert_fail_impl(); \