diff --git a/Source/Core/Core/Debugger/BranchWatch.cpp b/Source/Core/Core/Debugger/BranchWatch.cpp index 5f5084562c..d26150e1f6 100644 --- a/Source/Core/Core/Debugger/BranchWatch.cpp +++ b/Source/Core/Core/Debugger/BranchWatch.cpp @@ -118,9 +118,7 @@ void BranchWatch::Load(const CPUThreadGuard& guard, std::FILE* file) if (snapshot_metadata.is_selected) { - // TODO C++20: Parenthesized initialization of aggregates has bad compiler support. - m_selection.emplace_back(BranchWatchSelectionValueType{&*kv_iter, is_virtual, condition, - snapshot_metadata.inspection}); + m_selection.emplace_back(&*kv_iter, is_virtual, condition, snapshot_metadata.inspection); } else if (hits_snapshot != 0) { @@ -144,9 +142,7 @@ void BranchWatch::IsolateHasExecuted(const CPUThreadGuard&) { if (kv.second.hits_snapshot == 0) { - // TODO C++20: Parenthesized initialization of aggregates has bad compiler support. - m_selection.emplace_back( - BranchWatchSelectionValueType{&kv, is_virtual, condition, SelectionInspection{}}); + m_selection.emplace_back(&kv, is_virtual, condition); kv.second.hits_snapshot = kv.second.total_hits; } }