diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-08-28 16:48:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-28 16:48:19 -0400 |
commit | 2f7d18baf1485942efb27297724b82dde4255c76 (patch) | |
tree | cf3ffb0385aac8151f999d47b68b86c2adb8e380 /src/components/policy/policy_regular/src/update_status_manager.cc | |
parent | 9381e8a084e70f44ad84ecf0745cd239fdf245a8 (diff) | |
parent | 721fcfec20f26ff86dcbd652d12e7cc26e355b7f (diff) | |
download | sdl_core-2f7d18baf1485942efb27297724b82dde4255c76.tar.gz |
Merge branch 'develop' into feature/boost_system_command_implementationfeature/boost_system_command_implementation
Diffstat (limited to 'src/components/policy/policy_regular/src/update_status_manager.cc')
-rw-r--r-- | src/components/policy/policy_regular/src/update_status_manager.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/components/policy/policy_regular/src/update_status_manager.cc b/src/components/policy/policy_regular/src/update_status_manager.cc index 941113c753..66d21dea54 100644 --- a/src/components/policy/policy_regular/src/update_status_manager.cc +++ b/src/components/policy/policy_regular/src/update_status_manager.cc @@ -33,7 +33,6 @@ #include "policy/update_status_manager.h" #include "policy/policy_listener.h" #include "utils/logger.h" -#include "utils/make_shared.h" namespace policy { @@ -41,7 +40,7 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "Policy") UpdateStatusManager::UpdateStatusManager() : listener_(NULL) - , current_status_(utils::MakeShared<UpToDateStatus>()) + , current_status_(std::make_shared<UpToDateStatus>()) , last_processed_event_(kNoEvent) , apps_search_in_progress_(false) , app_registered_from_non_consented_device_(true) {} @@ -55,11 +54,11 @@ void UpdateStatusManager::ProcessEvent(UpdateEvent event) { DoTransition(); } -void UpdateStatusManager::SetNextStatus(utils::SharedPtr<Status> status) { +void UpdateStatusManager::SetNextStatus(std::shared_ptr<Status> status) { next_status_ = status; } -void UpdateStatusManager::SetPostponedStatus(utils::SharedPtr<Status> status) { +void UpdateStatusManager::SetPostponedStatus(std::shared_ptr<Status> status) { postponed_status_ = status; } |