RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace src_loc with std::soource_location

Browse source
This commit is contained in:
Elad Ashkenazi 2024-05-21 10:34:51 +03:00
parent 2d32ba5ca2
commit a2dcbb9c13
17 changed files with 146 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Loader/PSF.cpp
View file

@ -186,7 +186,7 @@ namespace psf
if (!static_cast<bool>(cond)) \
{ \
if (err != error::stream) \
psf_log.error("Error loading PSF '%s': %s%s", filename, err, src_loc{__builtin_LINE(), __builtin_COLUMN(), __builtin_FILE(), __builtin_FUNCTION()}); \
psf_log.error("Error loading PSF '%s': %s%s", filename, err, std::source_location::current()); \
result.sfo.clear(); \
result.errc = err; \
return result; \
@ -392,7 +392,7 @@ namespace psf
return found->second.as_integer();
}
bool check_registry(const registry& psf, std::function<bool(bool ok, const std::string& key, const entry& value)> validate, u32 line, u32 col, const char* file, const char* func)
bool check_registry(const registry& psf, std::function<bool(bool ok, const std::string& key, const entry& value)> validate, std::source_location src_loc)
{
bool psf_ok = true;
@ -413,12 +413,12 @@ namespace psf
{
if (value.type() == format::string)
{
psf_log.error("Entry '%s' is invalid: string='%s'.%s", key, value.as_string(), src_loc{line , col, file, func});
psf_log.error("Entry '%s' is invalid: string='%s'.%s", key, value.as_string(), src_loc);
}
else
{
// TODO: Better logging of other types
psf_log.error("Entry %s is invalid.%s", key, value.as_string(), src_loc{line , col, file, func});
psf_log.error("Entry %s is invalid.%s", key, value.as_string(), src_loc);
}
}