diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2019-02-10 19:08:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-10 19:08:15 +0100 |
| commit | 3afd9deded8fb2119c4dfd3d6c92d3af24edb5e9 (patch) | |
| tree | 628b78961d9f14b7d806b221c54efd2083d7cb28 | |
| parent | 0f5a4fa7d5449e96127482889596a878c73b9915 (diff) | |
| parent | b67955afcae7a63a37fba7d046c7217bd8a6c3c3 (diff) | |
Merge pull request #25774 from neikeq/fix-noreturn-attr-check
Fix check to determine if [[noreturn]] attribute is usable
| -rw-r--r-- | modules/mono/utils/macros.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/modules/mono/utils/macros.h b/modules/mono/utils/macros.h index 87295a98f2..e44f254e1c 100644 --- a/modules/mono/utils/macros.h +++ b/modules/mono/utils/macros.h @@ -31,10 +31,6 @@ #ifndef UTIL_MACROS_H #define UTIL_MACROS_H -#ifndef __has_cpp_attribute -#define __has_cpp_attribute(attr_token) 0 -#endif - #define _GD_VARNAME_CONCAT_B_(m_ignore, m_name) m_name #define _GD_VARNAME_CONCAT_A_(m_a, m_b, m_c) _GD_VARNAME_CONCAT_B_(hello there, m_a##m_b##m_c) #define _GD_VARNAME_CONCAT_(m_a, m_b, m_c) _GD_VARNAME_CONCAT_A_(m_a, m_b, m_c) @@ -61,7 +57,7 @@ // noreturn // TODO: Get rid of this macro once we upgrade to C++11 -#if __has_cpp_attribute(deprecated) +#if (__cplusplus >= 201103L) #define GD_NORETURN [[noreturn]] #elif defined(__GNUC__) #define GD_NORETURN __attribute__((noreturn)) |