diff options
| author | AKalinich-Luxoft <AKalinich@luxoft.com> | 2018-01-30 12:24:19 +0200 |
|---|---|---|
| committer | AKalinich-Luxoft <AKalinich@luxoft.com> | 2018-01-30 12:24:19 +0200 |
| commit | c95042bdce0bc3d598ce8300e7b17d7d55e9e4b4 (patch) | |
| tree | 2d2c325b2174a5e17ba7fbc2ab7d92cb4e4e1af5 | |
| parent | 4f0d4ef68ffec01fbcae39416d1fac43cc34ee22 (diff) | |
| download | sdl_core-c95042bdce0bc3d598ce8300e7b17d7d55e9e4b4.tar.gz | |
Answer review comments
| -rw-r--r-- | src/components/connection_handler/test/connection_handler_impl_test.cc | 6 | ||||
| -rw-r--r-- | src/components/protocol_handler/src/protocol_handler_impl.cc | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/components/connection_handler/test/connection_handler_impl_test.cc b/src/components/connection_handler/test/connection_handler_impl_test.cc index fc0ed7dd19..a951598917 100644 --- a/src/components/connection_handler/test/connection_handler_impl_test.cc +++ b/src/components/connection_handler/test/connection_handler_impl_test.cc @@ -1197,7 +1197,7 @@ TEST_F(ConnectionHandlerTest, SessionStop_CheckHash) { CheckSessionExists(uid_, out_context_.new_session_id_); const uint32_t end_audio = connection_handler_->OnSessionEndedCallback( - uid_, out_context_.new_session_id_, hash, kRpc); + uid_, out_context_.new_session_id_, &hash, kRpc); EXPECT_EQ(connection_key_, end_audio); CheckSessionExists(uid_, 0); } @@ -1213,13 +1213,13 @@ TEST_F(ConnectionHandlerTest, SessionStop_CheckSpecificHash) { const uint32_t end_audio_wrong_hash = connection_handler_->OnSessionEndedCallback( - uid_, out_context_.new_session_id_, wrong_hash, kRpc); + uid_, out_context_.new_session_id_, &wrong_hash, kRpc); EXPECT_EQ(0u, end_audio_wrong_hash); EXPECT_EQ(protocol_handler::HASH_ID_WRONG, wrong_hash); CheckSessionExists(uid_, out_context_.new_session_id_); const uint32_t end_audio = connection_handler_->OnSessionEndedCallback( - uid_, out_context_.new_session_id_, hash, kRpc); + uid_, out_context_.new_session_id_, &hash, kRpc); EXPECT_EQ(connection_key_, end_audio); CheckSessionExists(uid_, 0); } diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc index e7ff8d2f2d..47d546657f 100644 --- a/src/components/protocol_handler/src/protocol_handler_impl.cc +++ b/src/components/protocol_handler/src/protocol_handler_impl.cc @@ -1242,6 +1242,9 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageEndServiceACK( return RESULT_OK; } +// Suppress warning for deprecated method used within another deprecated method +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" RESULT_CODE ProtocolHandlerImpl::HandleControlMessageStartSession( const ProtocolPacket& packet) { LOG4CXX_AUTO_TRACE(logger_); |