diff options
author | JackLivio <jack@livio.io> | 2018-10-11 16:15:52 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2018-10-11 16:15:52 -0400 |
commit | 3a5d1ee222fb3a173031343f022c720b39a8c29c (patch) | |
tree | a644dc8faecaee219631c5b4e9e83965e1b76d2f | |
parent | e12b97bc3bfb3aa49545ae6954208be64dc3cb6f (diff) | |
download | sdl_core-3a5d1ee222fb3a173031343f022c720b39a8c29c.tar.gz |
Fix usage of base_rpc_version
-rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc | 5 | ||||
-rw-r--r-- | src/components/application_manager/src/rpc_handler_impl.cc | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc index 9cfd4f33b5..bc36b85db3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc @@ -332,13 +332,12 @@ void RegisterAppInterfaceRequest::Run() { } // Version negotiation - utils::SemanticVersion ver_4_5(4, 5, 0); utils::SemanticVersion module_version( major_version, minor_version, patch_version); - if (mobile_version <= ver_4_5) { + if (mobile_version <= utils::base_rpc_version) { // Mobile versioning did not exist for // versions 4.5 and prior. - application->set_msg_version(ver_4_5); + application->set_msg_version(utils::base_rpc_version); } else if (mobile_version < module_version) { // Use mobile RPC version as negotiated version application->set_msg_version(mobile_version); diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc index 0ccdf8b758..a33da0708f 100644 --- a/src/components/application_manager/src/rpc_handler_impl.cc +++ b/src/components/application_manager/src/rpc_handler_impl.cc @@ -219,8 +219,9 @@ void RPCHandlerImpl::GetMessageVersion( } utils::SemanticVersion temp_version(major, minor, patch); if (temp_version.isValid()) { - utils::SemanticVersion ver_4_5(4, 5, 0); - message_version = (temp_version > ver_4_5) ? temp_version : ver_4_5; + message_version = (temp_version > utils::base_rpc_version) + ? temp_version + : utils::base_rpc_version; } } } |