Compilation fix 2

This commit is contained in:
Nekotekina 2015-01-12 22:31:11 +03:00
parent b90540c1eb
commit e40347dd53
2 changed files with 3 additions and 3 deletions

View file

@ -135,8 +135,8 @@ inline void log_message(Log::LogType type, Log::LogSeverity sev, const char* tex
Log::LogManager::getInstance().log(msg);
}
template<typename T, size_t N, typename ...Ts>
inline void log_message(Log::LogType type, Log::LogSeverity sev, const char(&text)[N], T arg, Ts... args)
template<typename T, typename... Ts>
inline void log_message(Log::LogType type, Log::LogSeverity sev, const char* text, T arg, Ts... args)
{
Log::LogMessage msg{type, sev, fmt::format(text, arg, args...)};
Log::LogManager::getInstance().log(msg);

View file

@ -288,7 +288,7 @@ int decrypt_data(rFile *in, rFile *out, EDAT_HEADER *edat, NPD_HEADER *npd, unsi
if (!decrypt(hash_mode, crypto_mode, (npd->version == 4), enc_data, dec_data, length, key_result, iv, hash, hash_result))
{
if (verbose)
LOG_WARNING(LOADER, "EDAT: Block at offset 0x%llx has invalid hash!", offset);
LOG_WARNING(LOADER, "EDAT: Block at offset 0x%llx has invalid hash!", (u64)offset);
return 1;
}