From fe977c42881dd889e7a4185a6e718eaf40937ed5 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 30 Apr 2023 13:11:53 +0200 Subject: [PATCH] fix some warnings --- rpcs3/rpcs3qt/memory_string_searcher.cpp | 4 ++-- rpcs3/rpcs3qt/rpcn_settings_dialog.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/rpcs3qt/memory_string_searcher.cpp b/rpcs3/rpcs3qt/memory_string_searcher.cpp index 0136987de0..28cf5b6ff9 100644 --- a/rpcs3/rpcs3qt/memory_string_searcher.cpp +++ b/rpcs3/rpcs3qt/memory_string_searcher.cpp @@ -400,7 +400,7 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode) { while (first_char = section.find_first_of(insensitive_search, first_char), first_char != umax) { - const u32 start = addr + first_char; + const u32 start = addr + ::narrow(first_char); std::string_view test_sv{get_ptr(start), addr_max - start}; @@ -420,7 +420,7 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode) { while (first_char = section.find_first_of(wstr[0], first_char), first_char != umax) { - const u32 start = addr + first_char; + const u32 start = addr + ::narrow(first_char); std::string_view test_sv{get_ptr(start), addr_max - start}; diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp index cecd108cd8..2dff073574 100644 --- a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp @@ -53,7 +53,7 @@ std::string derive_password(std::string_view user_password) std::string_view salt_str = "No matter where you go, everybody's connected."; u8 derived_password_digest[SHA3_256_DIGEST_LENGTH]; - ensure(!wc_PBKDF2(derived_password_digest, reinterpret_cast(user_password.data()), user_password.size(), reinterpret_cast(salt_str.data()), salt_str.size(), 200'000, SHA3_256_DIGEST_LENGTH, WC_SHA3_256)); + ensure(!wc_PBKDF2(derived_password_digest, reinterpret_cast(user_password.data()), ::narrow(user_password.size()), reinterpret_cast(salt_str.data()), ::narrow(salt_str.size()), 200'000, SHA3_256_DIGEST_LENGTH, WC_SHA3_256)); std::string derived_password("0000000000000000000000000000000000000000000000000000000000000000"); for (u32 i = 0; i < SHA3_256_DIGEST_LENGTH; i++)