diff options
| author | conlain-k <conlain.k@gmail.com> | 2018-07-24 15:31:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 15:31:47 -0400 |
| commit | 90db9ca480eabeaf85ec77626b1bf10fa491270d (patch) | |
| tree | 1061840e02be20e216cca72685113ceffd592981 /src/components/include/transport_manager/transport_adapter/device.h | |
| parent | e1d597dafe130e73d68d7ccbd84a6b63db2a329f (diff) | |
| parent | a773acc84a6836129f1d9bc4b8b723b9e7301e0c (diff) | |
| download | sdl_core-90db9ca480eabeaf85ec77626b1bf10fa491270d.tar.gz | |
Merge branch 'develop' into feature/boost_filesystem_implementation
Diffstat (limited to 'src/components/include/transport_manager/transport_adapter/device.h')
| -rw-r--r-- | src/components/include/transport_manager/transport_adapter/device.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/include/transport_manager/transport_adapter/device.h b/src/components/include/transport_manager/transport_adapter/device.h index 148e715050..1ac1424477 100644 --- a/src/components/include/transport_manager/transport_adapter/device.h +++ b/src/components/include/transport_manager/transport_adapter/device.h @@ -35,9 +35,10 @@ #include <string> #include <vector> +#include <memory> #include "transport_manager/common.h" -#include "utils/shared_ptr.h" + #include "utils/macro.h" namespace transport_manager { @@ -160,7 +161,7 @@ class Device { **/ bool keep_on_disconnect_; }; -typedef utils::SharedPtr<Device> DeviceSptr; +typedef std::shared_ptr<Device> DeviceSptr; typedef std::vector<DeviceSptr> DeviceVector; } // namespace transport_adapter } // namespace transport_manager |