From 1257372af4cc6d6b350f4a91ec823f9c00161858 Mon Sep 17 00:00:00 2001 From: Conlain Kelly Date: Wed, 18 Jul 2018 15:01:15 -0400 Subject: style fix --- .../include/application_manager/application_manager_impl.h | 3 ++- .../src/app_launch/app_launch_data_json.cc | 3 +-- .../application_manager/src/application_data_impl.cc | 3 ++- .../application_manager/src/application_manager_impl.cc | 3 ++- .../src/event_engine/event_dispatcher_impl.cc | 3 +-- src/components/policy/policy_regular/src/cache_manager.cc | 2 +- src/components/utils/src/lock_boost.cc | 11 ++++------- 7 files changed, 13 insertions(+), 15 deletions(-) (limited to 'src/components') diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 79d5dda867..4fee30eb8a 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -1450,7 +1450,8 @@ class ApplicationManagerImpl ForbiddenApps forbidden_applications; // Lock for applications list - mutable std::shared_ptr applications_list_lock_ptr_; + mutable std::shared_ptr + applications_list_lock_ptr_; mutable std::shared_ptr apps_to_register_list_lock_ptr_; mutable sync_primitives::Lock subscribed_way_points_apps_lock_; diff --git a/src/components/application_manager/src/app_launch/app_launch_data_json.cc b/src/components/application_manager/src/app_launch/app_launch_data_json.cc index 99a6416a69..f7d24c26b1 100644 --- a/src/components/application_manager/src/app_launch/app_launch_data_json.cc +++ b/src/components/application_manager/src/app_launch/app_launch_data_json.cc @@ -43,8 +43,7 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "AppLaunch") AppLaunchDataJson::AppLaunchDataJson(const AppLaunchSettings& settings, resumption::LastState& last_state) - : AppLaunchDataImpl(settings) - , last_state_(last_state) {} + : AppLaunchDataImpl(settings), last_state_(last_state) {} AppLaunchDataJson::~AppLaunchDataJson() {} diff --git a/src/components/application_manager/src/application_data_impl.cc b/src/components/application_manager/src/application_data_impl.cc index 356c75dc77..3cfbeb2602 100644 --- a/src/components/application_manager/src/application_data_impl.cc +++ b/src/components/application_manager/src/application_data_impl.cc @@ -184,7 +184,8 @@ DynamicApplicationDataImpl::DynamicApplicationDataImpl() , choice_set_map_() , choice_set_map_lock_ptr_(std::make_shared()) , performinteraction_choice_set_map_() - , performinteraction_choice_set_lock_ptr_(std::make_shared()) + , performinteraction_choice_set_lock_ptr_( + std::make_shared()) , is_perform_interaction_active_(false) , is_reset_global_properties_active_(false) , perform_interaction_mode_(-1) {} diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 2c9f5d2f6f..3174e27607 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -143,7 +143,8 @@ ApplicationManagerImpl::ApplicationManagerImpl( const ApplicationManagerSettings& am_settings, const policy::PolicySettings& policy_settings) : settings_(am_settings) - , applications_list_lock_ptr_(std::make_shared()) + , applications_list_lock_ptr_( + std::make_shared()) , apps_to_register_list_lock_ptr_(std::make_shared()) , audio_pass_thru_active_(false) , audio_pass_thru_app_id_(0) diff --git a/src/components/application_manager/src/event_engine/event_dispatcher_impl.cc b/src/components/application_manager/src/event_engine/event_dispatcher_impl.cc index 505465d001..f1e5bf9735 100644 --- a/src/components/application_manager/src/event_engine/event_dispatcher_impl.cc +++ b/src/components/application_manager/src/event_engine/event_dispatcher_impl.cc @@ -39,8 +39,7 @@ namespace application_manager { namespace event_engine { using namespace sync_primitives; -EventDispatcherImpl::EventDispatcherImpl() - : observers_event_() {} +EventDispatcherImpl::EventDispatcherImpl() : observers_event_() {} EventDispatcherImpl::~EventDispatcherImpl() {} diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc index bfca801f74..64a16e5e6e 100644 --- a/src/components/policy/policy_regular/src/cache_manager.cc +++ b/src/components/policy/policy_regular/src/cache_manager.cc @@ -103,7 +103,7 @@ CacheManager::CacheManager() : CacheManagerInterface() , pt_(new policy_table::Table) , backup_(new SQLPTRepresentation()) - , update_required(false){ + , update_required(false) { LOG4CXX_AUTO_TRACE(logger_); backuper_ = new BackgroundBackuper(this); backup_thread_ = threads::CreateThread("Backup thread", backuper_); diff --git a/src/components/utils/src/lock_boost.cc b/src/components/utils/src/lock_boost.cc index a76bd02a78..c22ac467b5 100644 --- a/src/components/utils/src/lock_boost.cc +++ b/src/components/utils/src/lock_boost.cc @@ -51,11 +51,10 @@ Lock::~Lock() { void Lock::Acquire() { try { - mutex_.lock(); + mutex_.lock(); } catch (std::exception err) { LOG4CXX_FATAL(logger_, - "Failed to acquire mutex " << &mutex_ << ": " << - err.what()); + "Failed to acquire mutex " << &mutex_ << ": " << err.what()); NOTREACHED(); } AssertFreeAndMarkTaken(); @@ -103,18 +102,16 @@ RecursiveLock::~RecursiveLock() { void RecursiveLock::Acquire() { try { - mutex_.lock(); + mutex_.lock(); } catch (std::exception err) { LOG4CXX_FATAL(logger_, - "Failed to acquire mutex " << &mutex_ << ": " << - err.what()); + "Failed to acquire mutex " << &mutex_ << ": " << err.what()); NOTREACHED(); } AssertFreeAndMarkTaken(); } void RecursiveLock::Release() { - AssertTakenAndMarkFree(); mutex_.unlock(); } -- cgit v1.2.1