diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2016-07-29 14:25:39 -0400 |
|---|---|---|
| committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2016-07-29 14:26:35 -0400 |
| commit | 567dcb4d8894c8ebf13ea9ae7be5f0f490a99eb6 (patch) | |
| tree | e5fa2a3a4e829a7f85a45b72d2b59b117b498207 | |
| parent | 3a071dff27caa2f3cac4bbe96a1f701cead93f45 (diff) | |
| download | sdl_core-hotfix/coverity_fix_mixed_enums.tar.gz | |
Fixed another Coverity issue involving mixed enums (CID 80028)hotfix/coverity_fix_mixed_enums
| -rw-r--r-- | src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc | 6 | ||||
| -rw-r--r-- | src/components/application_manager/src/commands/mobile/slider_request.cc | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc b/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc index c33d2e477a..cdeccd86f4 100644 --- a/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc +++ b/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc @@ -175,11 +175,9 @@ void AlertManeuverRequest::on_event(const event_engine::Event& event) { if (pending_requests_.IsFinal(event_id)) { bool result = ((mobile_apis::Result::SUCCESS == tts_speak_result_code_ || - mobile_apis::Result::UNSUPPORTED_RESOURCE == - tts_speak_result_code_ || + mobile_apis::Result::UNSUPPORTED_RESOURCE == tts_speak_result_code_ || mobile_apis::Result::INVALID_ENUM == tts_speak_result_code_) && - mobile_apis::Result::SUCCESS == - navi_alert_maneuver_result_code_) || + mobile_apis::Result::SUCCESS == navi_alert_maneuver_result_code_) || (mobile_apis::Result::SUCCESS == tts_speak_result_code_ && mobile_apis::Result::UNSUPPORTED_RESOURCE == navi_alert_maneuver_result_code_); diff --git a/src/components/application_manager/src/commands/mobile/slider_request.cc b/src/components/application_manager/src/commands/mobile/slider_request.cc index cef2bed1fc..c46311c667 100644 --- a/src/components/application_manager/src/commands/mobile/slider_request.cc +++ b/src/components/application_manager/src/commands/mobile/slider_request.cc @@ -130,10 +130,11 @@ void SliderRequest::on_event(const event_engine::Event& event) { //event_id == hmi_apis::FunctionID::UI_Slider: LOG4CXX_INFO(logger_, "Received UI_Slider event"); - const int response_code = - message[strings::params][hmi_response::code].asInt(); + const mobile_apis::Result::eType response_code = + static_cast<mobile_apis::Result::eType>( + message[strings::params][hmi_response::code].asInt()); smart_objects::SmartObject response_msg_params = message[strings::msg_params]; - if (response_code == hmi_apis::Common_Result::ABORTED && + if (response_code == mobile_apis::Result::ABORTED && message[strings::params][strings::data].keyExists(strings::slider_position)) { //Copy slider_position info to msg_params section response_msg_params[strings::slider_position] = |