diff options
| author | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
|---|---|---|
| committer | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
| commit | 46ed776c537131e72747538488b213cf45f23e22 (patch) | |
| tree | 4cad1abf411addfd72ab591c93edeb5d225d9a39 /src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h | |
| parent | a24079cb8de5563376dcf782cdb9fe3cae063841 (diff) | |
| download | sdl_core-46ed776c537131e72747538488b213cf45f23e22.tar.gz | |
Latest internal release - last bulk merge before pull request and gitflow!?
Smoke tested on Ubuntu 12.04
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Diffstat (limited to 'src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h')
| -rw-r--r-- | src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h b/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h index 9efb7ba58d..0937222155 100644 --- a/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h +++ b/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h @@ -1,4 +1,4 @@ -/* +/** * \file usb_device_scanner.h * \brief UsbDeviceScanner class header file. * @@ -38,7 +38,8 @@ #include <list> -#include "utils/lock.h" +#include <pthread.h> + #include "transport_manager/transport_adapter/device_scanner.h" #include "transport_manager/usb/common.h" @@ -68,7 +69,7 @@ class UsbDeviceScanner : public DeviceScanner, public UsbDeviceListener { typedef std::list<PlatformUsbDevice*> Devices; Devices devices_; - sync_primitives::Lock devices_mutex_; + pthread_mutex_t devices_mutex_; }; } // namespace |