archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 09:18:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compilation fix

Browse source
This commit is contained in:
Nekotekina 2015-05-28 18:23:11 +03:00
parent 18fa6ca961
commit 74e13a4ef6
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Utilities/Log.h
View file

@ -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, const char* text);
void log_message(Log::LogType type, Log::LogSeverity sev, std::string text); void log_message(Log::LogType type, Log::LogSeverity sev, std::string text);
template<typename... Args> never_inline void log_message(Log::LogType type, Log::LogSeverity sev, const char* fmt, Args... args) printf_alike(3, 4) template<typename... Args> 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)...)); log_message(type, sev, fmt::Format(fmt, fmt::do_unveil(args)...));
} }

4
Utilities/StrFmt.h
View file

@ -95,7 +95,7 @@ namespace fmt
T by_value(T x) { return x; } T by_value(T x) { return x; }
//wrapper to deal with advance sprintf formating options with automatic length finding //wrapper to deal with advance sprintf formating options with automatic length finding
template<typename... Args> std::string Format(const char* fmt, Args... parameters) printf_alike(1, 2) template<typename... Args> printf_alike(1, 2) std::string Format(const char* fmt, Args... parameters)
{ {
size_t length = 256; size_t length = 256;
std::string str; std::string str;
@ -265,7 +265,7 @@ namespace fmt
vm::psv::ref (fmt::unveil) (vm_ref.h) vm::psv::ref (fmt::unveil) (vm_ref.h)
*/ */
template<typename... Args> force_inline safe_buffers std::string format(const char* fmt, Args... args) printf_alike(1, 2) template<typename... Args> force_inline safe_buffers printf_alike(1, 2) std::string format(const char* fmt, Args... args)
{ {
return Format(fmt, do_unveil(args)...); return Format(fmt, do_unveil(args)...);
} }

14
rpcs3/Emu/SysCalls/LogBase.h
View file

@ -35,12 +35,12 @@ public:
virtual const std::string& GetName() const = 0; virtual const std::string& GetName() const = 0;
template<typename... Args> force_inline void Notice(const char* fmt, Args... args) printf_alike(2, 3) const template<typename... Args> force_inline printf_alike(2, 3) void Notice(const char* fmt, Args... args) const
{ {
LogPrepare(LogNotice, fmt, fmt::do_unveil(args)...); LogPrepare(LogNotice, fmt, fmt::do_unveil(args)...);
} }
template<typename... Args> force_inline void Log(const char* fmt, Args... args) printf_alike(2, 3) const template<typename... Args> force_inline printf_alike(2, 3) void Log(const char* fmt, Args... args) const
{ {
if (CheckLogging()) if (CheckLogging())
{ {
@ -48,27 +48,27 @@ public:
} }
} }
template<typename... Args> force_inline void Success(const char* fmt, Args... args) printf_alike(2, 3) const template<typename... Args> force_inline printf_alike(2, 3) void Success(const char* fmt, Args... args) const
{ {
LogPrepare(LogSuccess, fmt, fmt::do_unveil(args)...); LogPrepare(LogSuccess, fmt, fmt::do_unveil(args)...);
} }
template<typename... Args> force_inline void Warning(const char* fmt, Args... args) printf_alike(2, 3) const template<typename... Args> force_inline printf_alike(2, 3) void Warning(const char* fmt, Args... args) const
{ {
LogPrepare(LogWarning, fmt, fmt::do_unveil(args)...); LogPrepare(LogWarning, fmt, fmt::do_unveil(args)...);
} }
template<typename... Args> force_inline void Error(const char* fmt, Args... args) printf_alike(2, 3) const template<typename... Args> force_inline printf_alike(2, 3) void Error(const char* fmt, Args... args) const
{ {
LogPrepare(LogError, fmt, fmt::do_unveil(args)...); LogPrepare(LogError, fmt, fmt::do_unveil(args)...);
} }
template<typename... Args> force_inline void Fatal(const char* fmt, Args... args) printf_alike(2, 3) const template<typename... Args> force_inline printf_alike(2, 3) void Fatal(const char* fmt, Args... args) const
{ {
LogPrepare(LogFatal, fmt, fmt::do_unveil(args)...); LogPrepare(LogFatal, fmt, fmt::do_unveil(args)...);
} }
template<typename... Args> force_inline void Todo(const char* fmt, Args... args) printf_alike(2, 3) const template<typename... Args> force_inline printf_alike(2, 3) void Todo(const char* fmt, Args... args) const
{ {
LogPrepare(LogTodo, fmt, fmt::do_unveil(args)...); LogPrepare(LogTodo, fmt, fmt::do_unveil(args)...);
} }