From 8678133e8746fdc20f7d012005ebf2db370ddccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 25 Jun 2016 21:46:39 +0200 Subject: ControllerInterface: Switch to std::shared_ptr Small cleanup by using std::shared_ptr and getting rid of ciface.Devices() which just returned the m_devices (which defeats the point of making m_devices protected). Incidentally, this should make the code safer when we have different threads accessing devices in the future (for hotplug?). A lot of code use Device references directly so there is no easy way to remove FindDevice() and make those unique_ptrs. --- Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp') 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 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 = FindDevice(qualifier); if (!device) return nullptr; -- cgit v1.2.3