summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference/ControlReference.h
diff options
context:
space:
mode:
authorMichael Maltese <michaeljosephmaltese@gmail.com>2016-12-09 13:57:01 -0800
committerMichael Maltese <michaeljosephmaltese@gmail.com>2017-02-07 22:59:29 -0800
commit2d51bf579f4c782951a3b9e7cd40327cdeb8b6b6 (patch)
treebf35f8d8b78e6ae9a107740d8a532cb892b6f7af /Source/Core/InputCommon/ControlReference/ControlReference.h
parent492d5b6ac7294ae183d47493b144ca0b3b4a7c2c (diff)
ControlReference: put parsed_expression in a unique_ptr
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ControlReference.h')
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.h b/Source/Core/InputCommon/ControlReference/ControlReference.h
index 49f08b97ce..e7e6e1a277 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.h
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.h
@@ -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;
};