summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-08-27 17:09:02 +0200
committerGitHub <noreply@github.com>2020-08-27 17:09:02 +0200
commit3f7b0e07721bf383325d874367efd7302e617fad (patch)
treefd374ae8e00159c6fabde1d21aeca9b3c0159a15
parentMerge pull request #4524 from lioncash/memory-log (diff)
parentcommon/assert: Make use of C++ attribute syntax (diff)
downloadyuzu-3f7b0e07721bf383325d874367efd7302e617fad.tar
yuzu-3f7b0e07721bf383325d874367efd7302e617fad.tar.gz
yuzu-3f7b0e07721bf383325d874367efd7302e617fad.tar.bz2
yuzu-3f7b0e07721bf383325d874367efd7302e617fad.tar.lz
yuzu-3f7b0e07721bf383325d874367efd7302e617fad.tar.xz
yuzu-3f7b0e07721bf383325d874367efd7302e617fad.tar.zst
yuzu-3f7b0e07721bf383325d874367efd7302e617fad.zip
Diffstat (limited to '')
-rw-r--r--src/common/assert.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common/assert.h b/src/common/assert.h
index 5b67c5c52..06d7b5612 100644
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -17,11 +17,12 @@
// enough for our purposes.
template <typename Fn>
#if defined(_MSC_VER)
-__declspec(noinline, noreturn)
+[[msvc::noinline, noreturn]]
#elif defined(__GNUC__)
- __attribute__((noinline, noreturn, cold))
+[[gnu::cold, gnu::noinline, noreturn]]
#endif
- static void assert_noinline_call(const Fn& fn) {
+static void
+assert_noinline_call(const Fn& fn) {
fn();
Crash();
exit(1); // Keeps GCC's mouth shut about this actually returning