diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-24 12:28:53 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-24 12:28:53 -0700 |
commit | a773acc84a6836129f1d9bc4b8b723b9e7301e0c (patch) | |
tree | d7a68454bc3515da1df8133e09fd5e860dd5c98a /src/components/application_manager/rpc_plugins/sdl_rpc_plugin | |
parent | 6ee1edcfe9bf62fdedfef073337bbb17fb060ad2 (diff) | |
parent | f8a549cdf0e1b52ef66f1ca703a1d07d4c99f645 (diff) | |
download | sdl_core-a773acc84a6836129f1d9bc4b8b723b9e7301e0c.tar.gz |
Merge pull request #2392 from smartdevicelink/feature/boost_lock_implementation
Feature/boost lock implementation
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin')
2 files changed, 2 insertions, 3 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h index 285b0b10db..950c295072 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h @@ -142,7 +142,7 @@ class CreateInteractionChoiceSetRequest volatile bool is_timed_out_; sync_primitives::Lock is_timed_out_lock_; - sync_primitives::Lock vr_commands_lock_; + sync_primitives::RecursiveLock vr_commands_lock_; /* * @brief Sends VR AddCommand request to HMI * diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc index 7451ea7905..d2d39dcd77 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc @@ -62,8 +62,7 @@ CreateInteractionChoiceSetRequest::CreateInteractionChoiceSetRequest( , expected_chs_count_(0) , received_chs_count_(0) , error_from_hmi_(false) - , is_timed_out_(false) - , vr_commands_lock_(true) {} + , is_timed_out_(false) {} CreateInteractionChoiceSetRequest::~CreateInteractionChoiceSetRequest() { LOG4CXX_AUTO_TRACE(logger_); |