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/OSX | |
| 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/OSX')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm index ea9723c6b9..48580cf98b 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm @@ -144,7 +144,7 @@ static void DeviceMatching_callback(void* inContext, IOReturn inResult, void* in // Add a device if it's of a type we want if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)) g_controller_interface.AddDevice( - new Keyboard(inIOHIDDeviceRef, name, kbd_name_counts[name]++, g_window)); + std::make_shared<Keyboard>(inIOHIDDeviceRef, name, kbd_name_counts[name]++, g_window)); #if 0 else if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Mouse)) @@ -152,7 +152,8 @@ static void DeviceMatching_callback(void* inContext, IOReturn inResult, void* in name, mouse_name_counts[name]++)); #endif else - g_controller_interface.AddDevice(new Joystick(inIOHIDDeviceRef, name, joy_name_counts[name]++)); + g_controller_interface.AddDevice( + std::make_shared<Joystick>(inIOHIDDeviceRef, name, joy_name_counts[name]++)); } void Init(void* window) |