diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2017-12-04 12:21:00 -0500 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2017-12-04 12:21:00 -0500 |
commit | a8c3e2ac28d758b30a2b933918635ef33f2d4cd3 (patch) | |
tree | 8f0871c23af4b53351a0aad30a87642cd2b3a024 /src/components/application_manager/src | |
parent | 8c94933f0d3be1ac6c6e4e88bf46dd02b52f62a6 (diff) | |
download | sdl_core-a8c3e2ac28d758b30a2b933918635ef33f2d4cd3.tar.gz |
Add DEPRECATED macro, and fix resulting deprecated warnings
Diffstat (limited to 'src/components/application_manager/src')
4 files changed, 10 insertions, 12 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index a2cba5198e..896713f8bc 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -1166,8 +1166,7 @@ void ApplicationManagerImpl::ReplaceHMIByMobileAppId( } } -// DEPRECATED -bool ApplicationManagerImpl::StartNaviService( +DEPRECATED bool ApplicationManagerImpl::StartNaviService( uint32_t app_id, protocol_handler::ServiceType service_type) { using namespace protocol_handler; LOG4CXX_AUTO_TRACE(logger_); @@ -1338,8 +1337,9 @@ void ApplicationManagerImpl::StopNaviService( app->StopStreaming(service_type); } -// DEPRECATED -bool ApplicationManagerImpl::OnServiceStartedCallback( +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +DEPRECATED bool ApplicationManagerImpl::OnServiceStartedCallback( const connection_handler::DeviceHandle& device_handle, const int32_t& session_key, const protocol_handler::ServiceType& type) { @@ -1374,6 +1374,7 @@ bool ApplicationManagerImpl::OnServiceStartedCallback( } return false; } +#pragma GCC diagnostic pop void ApplicationManagerImpl::OnServiceStartedCallback( const connection_handler::DeviceHandle& device_handle, @@ -2283,7 +2284,7 @@ bool ApplicationManagerImpl::ConvertSOtoMessage( } if (message.getElement(jhs::S_PARAMS).keyExists(strings::binary_data)) { - application_manager::BinaryData binaryData( + const application_manager::BinaryData binaryData( message.getElement(jhs::S_PARAMS) .getElement(strings::binary_data) .asBinary()); diff --git a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc index cff16e577c..9a802914c4 100644 --- a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc @@ -224,8 +224,7 @@ PerformAudioPassThruRequest::PrepareResponseParameters() { return response_params_; } -// DEPRECATED -bool PerformAudioPassThruRequest::PrepareResponseParameters( +DEPRECATED bool PerformAudioPassThruRequest::PrepareResponseParameters( mobile_apis::Result::eType& result_code, std::string& info) { LOG4CXX_AUTO_TRACE(logger_); NOTREACHED(); diff --git a/src/components/application_manager/src/message.cc b/src/components/application_manager/src/message.cc index d67a235a76..2a91289441 100644 --- a/src/components/application_manager/src/message.cc +++ b/src/components/application_manager/src/message.cc @@ -89,7 +89,7 @@ Message& Message::operator=(const Message& message) { set_data_size(message.data_size_); set_payload_size(message.payload_size_); if (message.binary_data_) { - set_binary_data(message.binary_data_); + set_binary_data((const BinaryData*)message.binary_data_); } set_json_message(message.json_message_); set_protocol_version(message.protocol_version()); @@ -194,8 +194,7 @@ void Message::set_message_type(MessageType type) { type_ = type; } -// DEPRECATED -void Message::set_binary_data(BinaryData* data) { +DEPRECATED void Message::set_binary_data(BinaryData* data) { if (NULL == data) { NOTREACHED(); return; diff --git a/src/components/application_manager/src/mobile_message_handler.cc b/src/components/application_manager/src/mobile_message_handler.cc index bc3aa32731..2f06c5f3b5 100644 --- a/src/components/application_manager/src/mobile_message_handler.cc +++ b/src/components/application_manager/src/mobile_message_handler.cc @@ -196,9 +196,8 @@ MobileMessageHandler::HandleIncomingMessageProtocolV2( outgoing_message->set_payload_size(message->payload_size()); if (!payload.data.empty()) { - BinaryData binary_payload_data(payload.data); + const BinaryData binary_payload_data(payload.data); outgoing_message->set_binary_data(&binary_payload_data); - outgoing_message->set_binary_data(&payload.data); } return outgoing_message.release(); } |