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/ControllerInterface.h | |
| 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/ControllerInterface.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 2571e5f3ab..2f4212ba85 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -6,7 +6,6 @@ #include <algorithm> #include <map> -#include <mutex> #include <sstream> #include <string> #include <vector> @@ -122,7 +121,7 @@ public: void Initialize(void* const hwnd); void Reinitialize(); void Shutdown(); - void AddDevice(ciface::Core::Device* device); + void AddDevice(std::shared_ptr<ciface::Core::Device> device); bool IsInit() const { return m_is_init; } void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const; |
