summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference/ExpressionParser.h
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/ExpressionParser.h
parent030dc11c6e31125cd03862f86815fe67d978f98d (diff)
ParseExpression: return a std::pair
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ExpressionParser.h')
-rw-r--r--Source/Core/InputCommon/ControlReference/ExpressionParser.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
index f07c9a1326..2d41933e50 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
@@ -6,6 +6,7 @@
#include <memory>
#include <string>
+#include <utility>
#include "InputCommon/ControllerInterface/Device.h"
namespace ciface
@@ -66,6 +67,6 @@ enum class ParseStatus
NoDevice,
};
-ParseStatus ParseExpression(const std::string& expr, ControlFinder& finder, Expression** expr_out);
+std::pair<ParseStatus, Expression*> ParseExpression(const std::string& expr, ControlFinder& finder);
}
}