diff options
| author | agaliuzov <agaliuzov@luxoft.com> | 2016-05-02 03:12:51 -0700 |
|---|---|---|
| committer | agaliuzov <agaliuzov@luxoft.com> | 2016-05-02 03:12:51 -0700 |
| commit | 10884727acbba22c6d7c9d96a8b46d0184c8bc4e (patch) | |
| tree | c1488658fffafbd3fae531eb1f43b0da1fa83486 /src/components | |
| parent | 9bbc8801ac2b8eca90b12dd4e2b5bb5416bc6ace (diff) | |
| parent | 58dafada90a5fc8bc9de50069d0b99d61fca511b (diff) | |
| download | sdl_core-10884727acbba22c6d7c9d96a8b46d0184c8bc4e.tar.gz | |
Merge branch 'master' into develop
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/application_manager/src/hmi_capabilities.cc | 1 | ||||
| -rw-r--r-- | src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities.cc b/src/components/application_manager/src/hmi_capabilities.cc index a5a35daa36..c8b4d16d45 100644 --- a/src/components/application_manager/src/hmi_capabilities.cc +++ b/src/components/application_manager/src/hmi_capabilities.cc @@ -41,7 +41,6 @@ #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/message_helper.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/application_manager_impl.h" #include "application_manager/message_helper.h" #include "formatters/CFormatterJsonBase.h" diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc index 29be3cd219..c422d895d0 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc @@ -97,6 +97,7 @@ int FindPairedDevs(std::vector<bdaddr_t>* result) { } pclose(pipe); LOG4CXX_TRACE(logger_, "exit with 0"); + delete [] buffer; return 0; } } // namespace |