diff options
| author | Michael M <mchtly@gmail.com> | 2017-06-07 15:29:00 -0700 |
|---|---|---|
| committer | Michael M <mchtly@gmail.com> | 2017-09-14 12:53:35 -0700 |
| commit | 3df945f8d0c34677b009c210dd0400b2e9655024 (patch) | |
| tree | 58224cd83ec770ca3583f2d83481f4079dcacbd2 /Source/Core/InputCommon/ControlReference/ExpressionParser.h | |
| parent | c33e391d267223fad8f9f6841c2729668b11da3c (diff) | |
ExpressionParser: replace bare pointers with unique_ptrs
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ExpressionParser.h')
| -rw-r--r-- | Source/Core/InputCommon/ControlReference/ExpressionParser.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h index 2d41933e50..d05ac6f546 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h @@ -51,13 +51,12 @@ class ExpressionNode; class Expression { public: - Expression() : node(nullptr) {} - Expression(ExpressionNode* node); + explicit Expression(std::unique_ptr<ExpressionNode>&& node = {}); ~Expression(); ControlState GetValue() const; void SetValue(ControlState state); int num_controls; - ExpressionNode* node; + std::unique_ptr<ExpressionNode> node; }; enum class ParseStatus @@ -67,6 +66,7 @@ enum class ParseStatus NoDevice, }; -std::pair<ParseStatus, Expression*> ParseExpression(const std::string& expr, ControlFinder& finder); +std::pair<ParseStatus, std::unique_ptr<Expression>> ParseExpression(const std::string& expr, + ControlFinder& finder); } } |
