From 5c6f5a161056493b086b23ed7713a6cf928598eb Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Thu, 30 Jun 2022 20:57:43 +0300 Subject: [PATCH] Cleanse LOG_CONSTINIT macro Should be unnecessary. --- rpcs3/util/logs.hpp | 8 +------- rpcs3/util/types.hpp | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/rpcs3/util/logs.hpp b/rpcs3/util/logs.hpp index 0bc6e31485..5f9a2118aa 100644 --- a/rpcs3/util/logs.hpp +++ b/rpcs3/util/logs.hpp @@ -182,13 +182,7 @@ namespace logs void set_init(std::initializer_list); } -#if __cpp_constinit >= 201907 -#define LOG_CONSTINIT constinit -#else -#define LOG_CONSTINIT -#endif - -#define LOG_CHANNEL(ch, ...) LOG_CONSTINIT inline ::logs::channel ch(::logs::make_channel_name(#ch, ##__VA_ARGS__)); \ +#define LOG_CHANNEL(ch, ...) inline constinit ::logs::channel ch(::logs::make_channel_name(#ch, ##__VA_ARGS__)); \ namespace logs { inline ::logs::registerer reg_##ch{ch}; } LOG_CHANNEL(rsx_log, "RSX"); diff --git a/rpcs3/util/types.hpp b/rpcs3/util/types.hpp index 0dc9d3b879..1f3fbf5d0e 100644 --- a/rpcs3/util/types.hpp +++ b/rpcs3/util/types.hpp @@ -68,6 +68,7 @@ namespace std #if defined(__INTELLISENSE__) #define consteval constexpr +#define constinit #endif using schar = signed char;