nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-03 02:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(Common/Misc): Replace old macros with modern C++ attributes (#6462)

Browse Source 
* chore(Common/Misc): Replace old macros with modern C++ attributes

* cherry-pick commit (5ae2a0f47d)

Co-Authored-By: Giacomo Pozzoni <giacomopoz@gmail.com>

* fix build

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
This commit is contained in:
Kitzunu
2021-06-21 17:26:01 +02:00
committed by GitHub
parent 5787d00d54
commit 5d9db23608
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/Debugging/Errors.h
View File

@@ -12,20 +12,20 @@
namespace Acore
{
DECLSPEC_NORETURN void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message) ATTR_NORETURN;
DECLSPEC_NORETURN void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message, char const* format, ...) ATTR_NORETURN ATTR_PRINTF(6, 7);
[[noreturn]] void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message);
[[noreturn]] void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message, char const* format, ...) ATTR_PRINTF(6, 7);
DECLSPEC_NORETURN void Fatal(char const* file, int line, char const* function, char const* message, ...) ATTR_NORETURN ATTR_PRINTF(4, 5);
[[noreturn]] void Fatal(char const* file, int line, char const* function, char const* message, ...) ATTR_PRINTF(4, 5);
DECLSPEC_NORETURN void Error(char const* file, int line, char const* function, char const* message) ATTR_NORETURN;
[[noreturn]] void Error(char const* file, int line, char const* function, char const* message);
DECLSPEC_NORETURN void Abort(char const* file, int line, char const* function) ATTR_NORETURN;
[[noreturn]] void Abort(char const* file, int line, char const* function);
DECLSPEC_NORETURN void Abort(char const* file, int line, char const* function, char const* message, ...) ATTR_NORETURN;
[[noreturn]] void Abort(char const* file, int line, char const* function, char const* message, ...);
void Warning(char const* file, int line, char const* function, char const* message);
DECLSPEC_NORETURN void AbortHandler(int sigval) ATTR_NORETURN;
[[noreturn]] void AbortHandler(int sigval);
} // namespace Acore

12
src/common/Define.h
View File

@@ -26,16 +26,8 @@
#if AC_PLATFORM == AC_PLATFORM_WINDOWS
# define ACORE_PATH_MAX MAX_PATH
# 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 //AC_PLATFORM != AC_PLATFORM_WINDOWS
# define ACORE_PATH_MAX PATH_MAX
# define DECLSPEC_NORETURN
# define DECLSPEC_DEPRECATED
#endif //AC_PLATFORM
#if !defined(COREDEBUG)
@@ -48,13 +40,9 @@
#endif //!COREDEBUG
#if AC_COMPILER == AC_COMPILER_GNU
# define ATTR_NORETURN __attribute__((noreturn))
# define ATTR_PRINTF(F, V) __attribute__ ((format (printf, F, V)))
# define ATTR_DEPRECATED __attribute__((deprecated))
#else //AC_COMPILER != AC_COMPILER_GNU
# define ATTR_NORETURN
# define ATTR_PRINTF(F, V)
# define ATTR_DEPRECATED
#endif //AC_COMPILER == AC_COMPILER_GNU
#ifdef ACORE_API_USE_DYNAMIC_LINKING