ControlReference: put parsed_expression in a unique_ptr

This commit is contained in:
Michael Maltese 2016-12-09 13:57:01 -08:00
parent 492d5b6ac7
commit 2d51bf579f
2 changed files with 13 additions and 18 deletions

View file

@ -4,6 +4,8 @@
#pragma once
#include <memory>
#include "InputCommon/ControlReference/ExpressionParser.h"
#include "InputCommon/ControllerInterface/Device.h"
@ -22,7 +24,6 @@ class ControlReference
public:
static bool InputGateOn();
virtual ~ControlReference();
virtual ControlState State(const ControlState state = 0) = 0;
virtual ciface::Core::Device::Control* Detect(const unsigned int ms,
ciface::Core::Device* const device) = 0;
@ -38,7 +39,7 @@ public:
protected:
ControlReference();
ciface::ExpressionParser::Expression* parsed_expression;
std::unique_ptr<ciface::ExpressionParser::Expression> m_parsed_expression;
ciface::ExpressionParser::ExpressionParseStatus m_parse_status;
};