diff --git a/Utilities/Log.h b/Utilities/Log.h index e5f684f0c2..32c3f1679e 100644 --- a/Utilities/Log.h +++ b/Utilities/Log.h @@ -129,7 +129,7 @@ static struct { inline operator Log::LogType() { return Log::LogType::TTY; } } T void log_message(Log::LogType type, Log::LogSeverity sev, const char* text); void log_message(Log::LogType type, Log::LogSeverity sev, std::string text); -template never_inline void log_message(Log::LogType type, Log::LogSeverity sev, const char* fmt, Args... args) printf_alike(3, 4) +template never_inline printf_alike(3, 4) void log_message(Log::LogType type, Log::LogSeverity sev, const char* fmt, Args... args) { log_message(type, sev, fmt::Format(fmt, fmt::do_unveil(args)...)); } diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h index b5bf570ce0..8db5552e9f 100644 --- a/Utilities/StrFmt.h +++ b/Utilities/StrFmt.h @@ -95,7 +95,7 @@ namespace fmt T by_value(T x) { return x; } //wrapper to deal with advance sprintf formating options with automatic length finding - template std::string Format(const char* fmt, Args... parameters) printf_alike(1, 2) + template printf_alike(1, 2) std::string Format(const char* fmt, Args... parameters) { size_t length = 256; std::string str; @@ -265,7 +265,7 @@ namespace fmt vm::psv::ref (fmt::unveil) (vm_ref.h) */ - template force_inline safe_buffers std::string format(const char* fmt, Args... args) printf_alike(1, 2) + template force_inline safe_buffers printf_alike(1, 2) std::string format(const char* fmt, Args... args) { return Format(fmt, do_unveil(args)...); } diff --git a/rpcs3/Emu/SysCalls/LogBase.h b/rpcs3/Emu/SysCalls/LogBase.h index 621ef6abf0..a64133efb8 100644 --- a/rpcs3/Emu/SysCalls/LogBase.h +++ b/rpcs3/Emu/SysCalls/LogBase.h @@ -35,12 +35,12 @@ public: virtual const std::string& GetName() const = 0; - template force_inline void Notice(const char* fmt, Args... args) printf_alike(2, 3) const + template force_inline printf_alike(2, 3) void Notice(const char* fmt, Args... args) const { LogPrepare(LogNotice, fmt, fmt::do_unveil(args)...); } - template force_inline void Log(const char* fmt, Args... args) printf_alike(2, 3) const + template force_inline printf_alike(2, 3) void Log(const char* fmt, Args... args) const { if (CheckLogging()) { @@ -48,27 +48,27 @@ public: } } - template force_inline void Success(const char* fmt, Args... args) printf_alike(2, 3) const + template force_inline printf_alike(2, 3) void Success(const char* fmt, Args... args) const { LogPrepare(LogSuccess, fmt, fmt::do_unveil(args)...); } - template force_inline void Warning(const char* fmt, Args... args) printf_alike(2, 3) const + template force_inline printf_alike(2, 3) void Warning(const char* fmt, Args... args) const { LogPrepare(LogWarning, fmt, fmt::do_unveil(args)...); } - template force_inline void Error(const char* fmt, Args... args) printf_alike(2, 3) const + template force_inline printf_alike(2, 3) void Error(const char* fmt, Args... args) const { LogPrepare(LogError, fmt, fmt::do_unveil(args)...); } - template force_inline void Fatal(const char* fmt, Args... args) printf_alike(2, 3) const + template force_inline printf_alike(2, 3) void Fatal(const char* fmt, Args... args) const { LogPrepare(LogFatal, fmt, fmt::do_unveil(args)...); } - template force_inline void Todo(const char* fmt, Args... args) printf_alike(2, 3) const + template force_inline printf_alike(2, 3) void Todo(const char* fmt, Args... args) const { LogPrepare(LogTodo, fmt, fmt::do_unveil(args)...); }