summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference/ControlReference.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/ControlReference.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/ControlReference.h')
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.h b/Source/Core/InputCommon/ControlReference/ControlReference.h
index 2e7f43fe65..48ce6434e1 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.h
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.h
@@ -31,7 +31,7 @@ public:
virtual bool IsInput() const = 0;
int BoundCount() const;
- ciface::ExpressionParser::ExpressionParseStatus GetParseStatus() const;
+ ciface::ExpressionParser::ParseStatus GetParseStatus() const;
void UpdateReference(const ciface::Core::DeviceContainer& devices,
const ciface::Core::DeviceQualifier& default_device);
@@ -41,7 +41,7 @@ public:
protected:
ControlReference();
std::unique_ptr<ciface::ExpressionParser::Expression> m_parsed_expression;
- ciface::ExpressionParser::ExpressionParseStatus m_parse_status;
+ ciface::ExpressionParser::ParseStatus m_parse_status;
};
//