diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2019-04-30 13:13:02 -0400 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2019-04-30 13:25:47 -0400 |
commit | 945d9a4e06bf74f257898671c9b63598d8b0a3bf (patch) | |
tree | 6d9d13a12f3522556f94be1b796c13385029e70a /src/components | |
parent | 09a161ba3e35c10b3f1b5d6c8a2d17943dbf516a (diff) | |
download | sdl_core-945d9a4e06bf74f257898671c9b63598d8b0a3bf.tar.gz |
Fix build failures from rearranged includes
Diffstat (limited to 'src/components')
6 files changed, 15 insertions, 7 deletions
diff --git a/src/components/application_manager/include/application_manager/app_extension.h b/src/components/application_manager/include/application_manager/app_extension.h index d6d5cbba64..5167aa88c0 100644 --- a/src/components/application_manager/include/application_manager/app_extension.h +++ b/src/components/application_manager/include/application_manager/app_extension.h @@ -33,6 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_ +#include <memory> + namespace ns_smart_device_link { namespace ns_smart_objects { class SmartObject; diff --git a/src/components/application_manager/include/application_manager/command_factory.h b/src/components/application_manager/include/application_manager/command_factory.h index 261d0e1e10..f479ee7f37 100644 --- a/src/components/application_manager/include/application_manager/command_factory.h +++ b/src/components/application_manager/include/application_manager/command_factory.h @@ -35,6 +35,7 @@ #include "application_manager/application_manager.h" #include "application_manager/commands/command.h" +#include "application_manager/hmi_capabilities.h" #include "application_manager/policies/policy_handler_interface.h" #include "application_manager/rpc_service.h" #include "utils/macro.h" diff --git a/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h b/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h index c5aedba029..b345f53c1c 100644 --- a/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h +++ b/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h @@ -37,6 +37,7 @@ #include "application_manager/event_engine/event.h" #include "application_manager/event_engine/event_dispatcher.h" #include "application_manager/event_engine/event_observer.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h index 1a12e973b2..521eadf48e 100644 --- a/src/components/include/application_manager/application_manager.h +++ b/src/components/include/application_manager/application_manager.h @@ -40,7 +40,6 @@ #include "application_manager/application.h" #include "application_manager/command_factory.h" #include "application_manager/commands/command.h" -#include "application_manager/hmi_capabilities.h" #include "connection_handler/connection_handler.h" #include "utils/data_accessor.h" diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h index c615195f94..643657951b 100644 --- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h +++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h @@ -35,6 +35,7 @@ #include <string> #include "media_manager/media_adapter_listener.h" +#include "utils/macro.h" namespace application_manager { class ApplicationManager; diff --git a/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h b/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h index 432e4f3fa0..9a8936e58a 100644 --- a/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h +++ b/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TCP_MOCK_TCP_TRANSPORT_ADAPTER_H_ #include "gmock/gmock.h" +#include "transport_manager/common.h" #include "transport_manager/tcp/tcp_transport_adapter.h" #include "transport_manager/transport_manager_settings.h" @@ -50,14 +51,17 @@ class MockTCPTransportAdapter : public TcpTransportAdapter { resumption::LastState& last_state, const transport_manager::TransportManagerSettings& settings) : TcpTransportAdapter(port, last_state, settings) {} - MOCK_CONST_METHOD2(FindEstablishedConnection, - ConnectionSPtr(const DeviceUID& device_handle, - const ApplicationHandle& app_handle)); + MOCK_CONST_METHOD2( + FindEstablishedConnection, + ConnectionSPtr(const transport_manager::DeviceUID& device_handle, + const transport_manager::ApplicationHandle& app_handle)); - MOCK_CONST_METHOD1(FindDevice, DeviceSptr(const DeviceUID& device_handle)); + MOCK_CONST_METHOD1( + FindDevice, DeviceSptr(const transport_manager::DeviceUID& device_handle)); MOCK_METHOD2(Connect, - TransportAdapter::Error(const DeviceUID& device_handle, - const ApplicationHandle& app_handle)); + TransportAdapter::Error( + const transport_manager::DeviceUID& device_handle, + const transport_manager::ApplicationHandle& app_handle)); void CallStore() { Store(); } |