Address review commentsfeature/deprecated_method_macro

Remove C style casts
Add comments for pragma directives
Remove redundant DEPRECATED macro usages

3 files changed, 6 insertions, 5 deletions

diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 896713f8bc..9da69b8279 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -1166,7 +1166,7 @@ void ApplicationManagerImpl::ReplaceHMIByMobileAppId(
   }
 }
 
-DEPRECATED bool ApplicationManagerImpl::StartNaviService(
+bool ApplicationManagerImpl::StartNaviService(
     uint32_t app_id, protocol_handler::ServiceType service_type) {
   using namespace protocol_handler;
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1337,9 +1337,10 @@ void ApplicationManagerImpl::StopNaviService(
   app->StopStreaming(service_type);
 }
 
+// Suppress warning for deprecated method used within another deprecated method
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-DEPRECATED bool ApplicationManagerImpl::OnServiceStartedCallback(
+bool ApplicationManagerImpl::OnServiceStartedCallback(
     const connection_handler::DeviceHandle& device_handle,
     const int32_t& session_key,
     const protocol_handler::ServiceType& type) {
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 9a802914c4..a05d41c098 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,7 +224,7 @@ PerformAudioPassThruRequest::PrepareResponseParameters() {
   return response_params_;
 }
 
-DEPRECATED bool PerformAudioPassThruRequest::PrepareResponseParameters(
+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 2a91289441..7bc686aef1 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((const BinaryData*)message.binary_data_);
+    set_binary_data(static_cast<const BinaryData*>(message.binary_data_));
   }
   set_json_message(message.json_message_);
   set_protocol_version(message.protocol_version());
@@ -194,7 +194,7 @@ void Message::set_message_type(MessageType type) {
   type_ = type;
 }
 
-DEPRECATED void Message::set_binary_data(BinaryData* data) {
+void Message::set_binary_data(BinaryData* data) {
   if (NULL == data) {
     NOTREACHED();
     return;