Partially revert "General: Toss out PRI macro usage"

This commit is contained in:
Lioncash
2015-09-08 01:44:37 -04:00
parent 3014feedc8
commit 19459e827f
36 changed files with 63 additions and 74 deletions

View File

@ -212,7 +212,7 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED(ev
ARCode code = GetARCode(i);
m_label_code_name->SetLabel(_("Name: ") + StrToWxStr(code.name));
std::string numcodes = StringFromFormat("Number of Codes: %lu", (unsigned long)code.ops.size());
std::string numcodes = StringFromFormat("Number of Codes: %zu", code.ops.size());
m_label_num_codes->SetLabel(StrToWxStr(numcodes));
m_listbox_codes_list->Clear();

View File

@ -206,7 +206,7 @@ std::string GameListItem::CreateCacheFilename()
// Filename.extension_HashOfFolderPath_Size.cache
// Append hash to prevent ISO name-clashing in different folders.
Filename.append(StringFromFormat("%s_%x_%llx.cache",
Filename.append(StringFromFormat("%s_%x_%" PRIx64 ".cache",
extension.c_str(), HashFletcher((const u8 *)LegalPathname.c_str(), LegalPathname.size()),
File::GetSize(m_FileName)));

View File

@ -112,7 +112,7 @@ CISOProperties::CISOProperties(const std::string& fileName, wxWindow* parent, wx
u8 game_id_bytes[8];
if (OpenISO->GetTitleID(game_id_bytes))
{
game_id = StringFromFormat("%016llx", Common::swap64(game_id_bytes));
game_id = StringFromFormat("%016" PRIx64, Common::swap64(game_id_bytes));
}
}