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 #8698 from howard0su/warning_capture 

Cleanup warnings of -Wunused-lambda-capture
This commit is contained in:
JosJuice 2020-03-26 10:37:33 +01:00 committed by GitHub
parent 4b91185056 da223a2271
commit 5988d20917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
View File

@ -131,14 +131,13 @@ void AdvancedPane::CreateLayout()
void AdvancedPane::ConnectLayout() void AdvancedPane::ConnectLayout()
{ {
connect(m_cpu_emulation_engine_combobox, connect(m_cpu_emulation_engine_combobox,
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [](int index) {
[this](int index) {
SConfig::GetInstance().cpu_core = PowerPC::AvailableCPUCores()[index]; SConfig::GetInstance().cpu_core = PowerPC::AvailableCPUCores()[index];
Config::SetBaseOrCurrent(Config::MAIN_CPU_CORE, PowerPC::AvailableCPUCores()[index]); Config::SetBaseOrCurrent(Config::MAIN_CPU_CORE, PowerPC::AvailableCPUCores()[index]);
}); });
connect(m_enable_mmu_checkbox, &QCheckBox::toggled, this, connect(m_enable_mmu_checkbox, &QCheckBox::toggled, this,
[this](bool checked) { SConfig::GetInstance().bMMU = checked; }); [](bool checked) { SConfig::GetInstance().bMMU = checked; });
m_cpu_clock_override_checkbox->setChecked(SConfig::GetInstance().m_OCEnable); m_cpu_clock_override_checkbox->setChecked(SConfig::GetInstance().m_OCEnable);
connect(m_cpu_clock_override_checkbox, &QCheckBox::toggled, [this](bool enable_clock_override) { connect(m_cpu_clock_override_checkbox, &QCheckBox::toggled, [this](bool enable_clock_override) {

2
Source/Core/VideoCommon/CommandProcessor.cpp
View File

@ -196,7 +196,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
} }
mmio->Register(base | FIFO_BP_LO, MMIO::DirectRead<u16>(MMIO::Utils::LowPart(&fifo.CPBreakpoint)), mmio->Register(base | FIFO_BP_LO, MMIO::DirectRead<u16>(MMIO::Utils::LowPart(&fifo.CPBreakpoint)),
MMIO::ComplexWrite<u16>([WMASK_LO_ALIGN_32BIT](u32, u16 val) { MMIO::ComplexWrite<u16>([](u32, u16 val) {
WriteLow(fifo.CPBreakpoint, val & WMASK_LO_ALIGN_32BIT); WriteLow(fifo.CPBreakpoint, val & WMASK_LO_ALIGN_32BIT);
})); }));
mmio->Register(base | FIFO_BP_HI, mmio->Register(base | FIFO_BP_HI,

2
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -523,7 +523,7 @@ void TextureCacheBase::DoSaveState(PointerWrap& p)
// Storing them would duplicate data in the save state file, adding to decompression time. // Storing them would duplicate data in the save state file, adding to decompression time.
return entry->IsCopy(); return entry->IsCopy();
}; };
auto AddCacheEntryToMap = [&entry_map, &entries_to_save, &p](TCacheEntry* entry) -> u32 { auto AddCacheEntryToMap = [&entry_map, &entries_to_save](TCacheEntry* entry) -> u32 {
auto iter = entry_map.find(entry); auto iter = entry_map.find(entry);
if (iter != entry_map.end()) if (iter != entry_map.end())
return iter->second; return iter->second;