diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-17 13:33:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 13:33:49 -0700 |
| commit | 493bec0d8eea81a01ab71c17c20f7fdcc0a50b66 (patch) | |
| tree | 0c764f53701020153d20173508e735aaa604783e /src/components/application_manager | |
| parent | 4dde9552b3d9ab5fa29502810be48bdf0f793cd7 (diff) | |
| parent | da6680cd4d1014e9f619b05ec69dd8ad74b1e230 (diff) | |
| download | sdl_core-493bec0d8eea81a01ab71c17c20f7fdcc0a50b66.tar.gz | |
Merge pull request #2297 from smartdevicelink/feature/use_STL_atomics
Remove custom atomic in favor of std::atomic types
Diffstat (limited to 'src/components/application_manager')
| -rw-r--r-- | src/components/application_manager/include/application_manager/application_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h index 46706fad4f..d9e542fa42 100644 --- a/src/components/application_manager/include/application_manager/application_impl.h +++ b/src/components/application_manager/include/application_manager/application_impl.h @@ -50,7 +50,7 @@ #include "connection_handler/device.h" #include "utils/lock.h" -#include "utils/atomic_object.h" +#include <atomic> #include "utils/custom_string.h" #include "utils/timer.h" #include "utils/macro.h" @@ -499,7 +499,7 @@ class ApplicationImpl : public virtual Application, HelpPromptManagerImpl help_prompt_manager_impl_; protocol_handler::MajorProtocolVersion protocol_version_; bool is_voice_communication_application_; - sync_primitives::atomic_bool is_resuming_; + std::atomic_bool is_resuming_; mobile_api::HMILevel::eType deferred_resumption_hmi_level_; bool is_hash_changed_during_suspend_; |