piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 16:49:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

DSP/LabelMap: Use std::optional with GetLabelValue()

Browse Source 
Rather than use a bool and out parameter, we can collapse them into one
by using a std::optional.
This commit is contained in:
Lioncash
2019-06-07 17:26:22 -04:00
parent 747128b093
commit a3ed4ceec5
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/DSP/DSPAssembler.cpp
View File

@ -200,9 +200,9 @@ s32 DSPAssembler::ParseValue(const char* str)
else // Everything else is a label.
{
// Lookup label
u16 value;
if (m_labels.GetLabelValue(ptr, &value))
return value;
if (const std::optional<u16> value = m_labels.GetLabelValue(ptr))
return *value;
if (m_cur_pass == 2)
ShowError(AssemblerError::UnknownLabel, str);
}