diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2021-06-20 16:52:24 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-11 11:48:31 +0100 |
| commit | 2bc1bbd91daab1da32caffb535da9ce39ff20725 (patch) | |
| tree | f2b3e3285a2bf8062290b9e41cc063d285a964a7 | |
| parent | d0fe16b78743bace4e620089787dfd3919a31a68 (diff) | |
Common/Misc: Replace old macros with modern C++ attributes (#26613)
(cherry picked from commit 5ae2a0f47d323fadcfebf44c7b6ec11a3f91c75a)
| -rw-r--r-- | src/common/Debugging/Errors.h | 14 | ||||
| -rw-r--r-- | src/common/Define.h | 12 |
2 files changed, 7 insertions, 19 deletions
diff --git a/src/common/Debugging/Errors.h b/src/common/Debugging/Errors.h index 4728ab35d2f..003cb843696 100644 --- a/src/common/Debugging/Errors.h +++ b/src/common/Debugging/Errors.h @@ -23,19 +23,19 @@ namespace Trinity { - DECLSPEC_NORETURN TC_COMMON_API void Assert(char const* file, int line, char const* function, std::string debugInfo, char const* message) ATTR_NORETURN; - DECLSPEC_NORETURN TC_COMMON_API void Assert(char const* file, int line, char const* function, std::string debugInfo, char const* message, char const* format, ...) ATTR_NORETURN ATTR_PRINTF(6, 7); + [[noreturn]] TC_COMMON_API void Assert(char const* file, int line, char const* function, std::string debugInfo, char const* message); + [[noreturn]] TC_COMMON_API void Assert(char const* file, int line, char const* function, std::string debugInfo, char const* message, char const* format, ...) ATTR_PRINTF(6, 7); - DECLSPEC_NORETURN TC_COMMON_API void Fatal(char const* file, int line, char const* function, char const* message, ...) ATTR_NORETURN ATTR_PRINTF(4, 5); + [[noreturn]] TC_COMMON_API void Fatal(char const* file, int line, char const* function, char const* message, ...) ATTR_PRINTF(4, 5); - DECLSPEC_NORETURN TC_COMMON_API void Error(char const* file, int line, char const* function, char const* message) ATTR_NORETURN; + [[noreturn]] TC_COMMON_API void Error(char const* file, int line, char const* function, char const* message); - DECLSPEC_NORETURN TC_COMMON_API void Abort(char const* file, int line, char const* function) ATTR_NORETURN; - DECLSPEC_NORETURN TC_COMMON_API void Abort(char const* file, int line, char const* function, char const* message, ...) ATTR_NORETURN; + [[noreturn]] TC_COMMON_API void Abort(char const* file, int line, char const* function); + [[noreturn]] TC_COMMON_API void Abort(char const* file, int line, char const* function, char const* message, ...); TC_COMMON_API void Warning(char const* file, int line, char const* function, char const* message); - DECLSPEC_NORETURN TC_COMMON_API void AbortHandler(int sigval) ATTR_NORETURN; + [[noreturn]] TC_COMMON_API void AbortHandler(int sigval); } // namespace Trinity diff --git a/src/common/Define.h b/src/common/Define.h index b43dfbf610c..2c348536f5c 100644 --- a/src/common/Define.h +++ b/src/common/Define.h @@ -60,16 +60,8 @@ #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS # define TRINITY_PATH_MAX 260 # define _USE_MATH_DEFINES -# ifndef DECLSPEC_NORETURN -# define DECLSPEC_NORETURN __declspec(noreturn) -# endif //DECLSPEC_NORETURN -# ifndef DECLSPEC_DEPRECATED -# define DECLSPEC_DEPRECATED __declspec(deprecated) -# endif //DECLSPEC_DEPRECATED #else // TRINITY_PLATFORM != TRINITY_PLATFORM_WINDOWS # define TRINITY_PATH_MAX PATH_MAX -# define DECLSPEC_NORETURN -# define DECLSPEC_DEPRECATED #endif // TRINITY_PLATFORM #if !defined(COREDEBUG) @@ -82,13 +74,9 @@ #endif //!COREDEBUG #if TRINITY_COMPILER == TRINITY_COMPILER_GNU -# define ATTR_NORETURN __attribute__((__noreturn__)) # define ATTR_PRINTF(F, V) __attribute__ ((__format__ (__printf__, F, V))) -# define ATTR_DEPRECATED __attribute__((__deprecated__)) #else //TRINITY_COMPILER != TRINITY_COMPILER_GNU -# define ATTR_NORETURN # define ATTR_PRINTF(F, V) -# define ATTR_DEPRECATED #endif //TRINITY_COMPILER == TRINITY_COMPILER_GNU #ifdef TRINITY_API_USE_DYNAMIC_LINKING |