summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference/ControlReference.cpp
diff options
context:
space:
mode:
authorMichael M <mchtly@gmail.com>2017-06-07 14:53:41 -0700
committerMichael M <mchtly@gmail.com>2017-09-14 12:53:34 -0700
commitd2821e14fa9735ece3be6eec9d6bdf4cf96c1280 (patch)
tree7c82aad1be267fc4d94c7641a2815ac6de102a6c /Source/Core/InputCommon/ControlReference/ControlReference.cpp
parent030dc11c6e31125cd03862f86815fe67d978f98d (diff)
ParseExpression: return a std::pair
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ControlReference.cpp')
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
index e4162e22a7..e5e4c1a578 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.cpp
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
@@ -30,9 +30,9 @@ bool ControlReference::InputGateOn()
void ControlReference::UpdateReference(const ciface::Core::DeviceContainer& devices,
const ciface::Core::DeviceQualifier& default_device)
{
- Expression* expr;
ControlFinder finder(devices, default_device, IsInput());
- m_parse_status = ParseExpression(expression, finder, &expr);
+ Expression* expr;
+ std::tie(m_parse_status, expr) = ParseExpression(expression, finder);
m_parsed_expression.reset(expr);
}