ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8980 from Tilka/warnings 

Fix some GCC warnings
This commit is contained in:
LC 2020-07-24 12:53:24 -04:00 committed by GitHub
parent f96f3b3278 062dd5ab0a
commit 520af035d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/EXI/EXI_Channel.h
View File

@ -109,6 +109,9 @@ private:
UEXI_CONTROL m_control;
u32 m_imm_data = 0;
// Since channels operate a bit differently from each other
u32 m_channel_id;
// This data is needed in order to reinitialize a GCI folder memory card when switching between
// GCI folder and other devices in the memory card slot or after loading a savestate. Even though
// this data is only vaguely related to the EXI_Channel, this seems to be the best place to store
@ -122,8 +125,5 @@ private:
};
std::array<std::unique_ptr<IEXIDevice>, NUM_DEVICES> m_devices;
// Since channels operate a bit differently from each other
u32 m_channel_id;
};
} // namespace ExpansionInterface

2
Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
View File

@ -185,8 +185,6 @@ void CEXIMemoryCard::SetupGciFolder(const Memcard::HeaderData& header_data)
CurrentGameId = Common::swap32(reinterpret_cast<const u8*>(game_id.c_str()));
}
const bool shift_jis = header_data.m_encoding != 0;
const auto [strDirectoryName, migrate] = GetGCIFolderPath(card_index, AllowMovieFolder::Yes);
const File::FileInfo file_info(strDirectoryName);

4
Source/Core/Core/IOS/Network/Socket.cpp
View File

@ -754,7 +754,7 @@ void WiiSockMan::UpdatePollCommands()
const auto elapsed = elapsed_d.count();
last_time = now;
for (auto& pcmd : pending_polls)
for (PollCommand& pcmd : pending_polls)
{
// Don't touch negative timeouts
if (pcmd.timeout > 0)
@ -764,7 +764,7 @@ void WiiSockMan::UpdatePollCommands()
pending_polls.erase(
std::remove_if(
pending_polls.begin(), pending_polls.end(),
[this](auto& pcmd) {
[this](PollCommand& pcmd) {
const auto request = Request(pcmd.request_addr);
auto& pfds = pcmd.wii_fds;
int ret = 0;

6
Source/Core/DiscIO/WIABlob.cpp
View File

@ -603,9 +603,9 @@ WIARVZFileReader<RVZ>::Chunk::Chunk(File::IOFile* file, u64 offset_in_file, u64
u64 decompressed_size, u32 exception_lists,
bool compressed_exception_lists, u32 rvz_packed_size,
u64 data_offset, std::unique_ptr<Decompressor> decompressor)
: m_file(file), m_offset_in_file(offset_in_file), m_exception_lists(exception_lists),
m_compressed_exception_lists(compressed_exception_lists), m_rvz_packed_size(rvz_packed_size),
m_data_offset(data_offset), m_decompressor(std::move(decompressor))
: m_decompressor(std::move(decompressor)), m_file(file), m_offset_in_file(offset_in_file),
m_exception_lists(exception_lists), m_compressed_exception_lists(compressed_exception_lists),
m_rvz_packed_size(rvz_packed_size), m_data_offset(data_offset)
{
constexpr size_t MAX_SIZE_PER_EXCEPTION_LIST =
Common::AlignUp(VolumeWii::BLOCK_HEADER_SIZE, sizeof(SHA1)) / sizeof(SHA1) *

5
Source/Core/DolphinQt/Debugger/ThreadWidget.cpp
View File

@ -265,9 +265,6 @@ void ThreadWidget::Update()
const auto format_hex = [](u32 value) {
return QStringLiteral("%1").arg(value, 8, 16, QLatin1Char('0'));
};
const auto format_f64_as_u64 = [](double value) {
return QStringLiteral("%1").arg(Common::BitCast<u64>(value), 16, 16, QLatin1Char('0'));
};
const auto format_hex_from = [&format_hex](u32 addr) {
addr = PowerPC::HostIsRAMAddress(addr) ? PowerPC::HostRead_U32(addr) : 0;
return format_hex(addr);
@ -468,7 +465,7 @@ void ThreadWidget::OnSelectionChanged(int row)
{
Common::Debug::PartialContext context;
if (row >= 0 && row < m_threads.size())
if (row >= 0 && size_t(row) < m_threads.size())
context = m_threads[row]->GetContext();
UpdateThreadContext(context);

1
Source/Core/DolphinQt/GameList/GameList.cpp
View File

@ -305,7 +305,6 @@ void GameList::ShowContextMenu(const QPoint&)
if (DiscIO::IsDisc(platform))
{
menu->addAction(tr("Set as &Default ISO"), this, &GameList::SetDefaultISO);
const auto blob_type = game->GetBlobType();
if (can_convert(game))
menu->addAction(tr("Convert File..."), this, &GameList::ConvertFile);