asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Merge pull request #25774 from neikeq/fix-noreturn-attr-check

Browse source 
Fix check to determine if [[noreturn]] attribute is usable
This commit is contained in:
Ignacio Etcheverry 2019-02-10 19:08:15 +01:00 committed by GitHub
commit 3afd9deded
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/mono/utils/macros.h
View file

@ -31,10 +31,6 @@
#ifndef UTIL_MACROS_H #ifndef UTIL_MACROS_H
#define 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_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_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) #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 // noreturn
// TODO: Get rid of this macro once we upgrade to C++11 // TODO: Get rid of this macro once we upgrade to C++11
#if __has_cpp_attribute(deprecated) #if (__cplusplus >= 201103L)
#define GD_NORETURN [[noreturn]] #define GD_NORETURN [[noreturn]]
#elif defined(__GNUC__) #elif defined(__GNUC__)
#define GD_NORETURN __attribute__((noreturn)) #define GD_NORETURN __attribute__((noreturn))