summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference/ExpressionParser.h
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2017-02-28 18:48:45 +0100
committerGitHub <noreply@github.com>2017-02-28 18:48:45 +0100
commit0a8b5b79ef19ab0115b7b0c8d11de4c091e6f5f2 (patch)
tree1d9d40b336b960045f919cafaaf754dd47a5bc99 /Source/Core/InputCommon/ControlReference/ExpressionParser.h
parentbd89c7b2c4dedc35fd3757554170a45539a4b0b9 (diff)
parentd104e5e916b2a9e28f343dd1138ce910e639ae85 (diff)
Merge pull request #4985 from lioncash/enum-class
ExpressionParser: Convert parse state enum into an enum class
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ExpressionParser.h')
-rw-r--r--Source/Core/InputCommon/ControlReference/ExpressionParser.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
index 3c602abeff..2681c551fc 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
@@ -59,14 +59,13 @@ public:
ExpressionNode* node;
};
-enum ExpressionParseStatus
+enum class ParseStatus
{
- EXPRESSION_PARSE_SUCCESS = 0,
- EXPRESSION_PARSE_SYNTAX_ERROR,
- EXPRESSION_PARSE_NO_DEVICE,
+ Success,
+ SyntaxError,
+ NoDevice,
};
-ExpressionParseStatus ParseExpression(const std::string& expr, ControlFinder& finder,
- Expression** expr_out);
+ParseStatus ParseExpression(const std::string& expr, ControlFinder& finder, Expression** expr_out);
}
}