diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-06-26 04:03:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 04:03:33 +0200 |
| commit | c1fa1e67497ed38623f63d1457e1992e56287833 (patch) | |
| tree | ab08f49876092b20db0d05faabfa769c76fb2abc /Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp | |
| parent | e31a4d1f0731603d0396e592e23cf7acd0457397 (diff) | |
| parent | 8678133e8746fdc20f7d012005ebf2db370ddccc (diff) | |
Merge pull request #3923 from leoetlino/ciface-small-cleanup
ControllerInterface: Small cleanup
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp index a87bdf8d35..7c916d108d 100644 --- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp @@ -333,7 +333,7 @@ public: operator std::string() override { return OpName(op) + "(" + (std::string)(*inner) + ")"; } }; -Device* ControlFinder::FindDevice(ControlQualifier qualifier) +std::shared_ptr<Device> ControlFinder::FindDevice(ControlQualifier qualifier) { if (qualifier.has_device) return container.FindDevice(qualifier.device_qualifier); @@ -343,7 +343,7 @@ Device* ControlFinder::FindDevice(ControlQualifier qualifier) Device::Control* ControlFinder::FindControl(ControlQualifier qualifier) { - Device* device = FindDevice(qualifier); + const std::shared_ptr<Device> device = FindDevice(qualifier); if (!device) return nullptr; |