diff options
| author | bunnei <bunneidev@gmail.com> | 2020-08-27 11:09:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 11:09:02 -0400 |
| commit | 3f7b0e07721bf383325d874367efd7302e617fad (patch) | |
| tree | fd374ae8e00159c6fabde1d21aeca9b3c0159a15 /src/common/assert.h | |
| parent | 9864da7d43cd6fca1d48762fde7405269b821c68 (diff) | |
| parent | 3bfaabdbdd9e7e74f09c209ad239c5087f702ec0 (diff) | |
Merge pull request #4577 from lioncash/asserts
common/assert: Make use of C++ attribute syntax
Diffstat (limited to 'src/common/assert.h')
| -rw-r--r-- | src/common/assert.h | 7 |
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 |