diff options
author | conlain-k <conlain.k@gmail.com> | 2018-07-24 15:31:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-24 15:31:47 -0400 |
commit | 90db9ca480eabeaf85ec77626b1bf10fa491270d (patch) | |
tree | 1061840e02be20e216cca72685113ceffd592981 /src/components/policy/policy_regular/include/policy/cache_manager.h | |
parent | e1d597dafe130e73d68d7ccbd84a6b63db2a329f (diff) | |
parent | a773acc84a6836129f1d9bc4b8b723b9e7301e0c (diff) | |
download | sdl_core-90db9ca480eabeaf85ec77626b1bf10fa491270d.tar.gz |
Merge branch 'develop' into feature/boost_filesystem_implementation
Diffstat (limited to 'src/components/policy/policy_regular/include/policy/cache_manager.h')
-rw-r--r-- | src/components/policy/policy_regular/include/policy/cache_manager.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/components/policy/policy_regular/include/policy/cache_manager.h b/src/components/policy/policy_regular/include/policy/cache_manager.h index 4a0a09db83..a28f1b3461 100644 --- a/src/components/policy/policy_regular/include/policy/cache_manager.h +++ b/src/components/policy/policy_regular/include/policy/cache_manager.h @@ -35,7 +35,6 @@ #include <map> -#include "utils/shared_ptr.h" #include "policy/pt_representation.h" #include "policy/pt_ext_representation.h" #include "policy/usage_statistics/statistics_manager.h" @@ -216,7 +215,7 @@ class CacheManager : public CacheManagerInterface { * device_info, statistics, excluding user messages * @return Generated structure for obtaining Json string. */ - virtual utils::SharedPtr<policy_table::Table> GenerateSnapshot(); + virtual std::shared_ptr<policy_table::Table> GenerateSnapshot(); /** * Applies policy table to the current table @@ -723,7 +722,7 @@ class CacheManager : public CacheManagerInterface { const PolicySettings& get_settings() const; - utils::SharedPtr<policy_table::Table> pt() const { + std::shared_ptr<policy_table::Table> pt() const { return pt_; } @@ -775,14 +774,14 @@ class CacheManager : public CacheManagerInterface { policy::Permissions& permission); private: - utils::SharedPtr<policy_table::Table> pt_; - utils::SharedPtr<policy_table::Table> snapshot_; - utils::SharedPtr<PTRepresentation> backup_; + std::shared_ptr<policy_table::Table> pt_; + std::shared_ptr<policy_table::Table> snapshot_; + std::shared_ptr<PTRepresentation> backup_; bool update_required; typedef std::set<std::string> UnpairedDevices; UnpairedDevices is_unpaired_; - mutable sync_primitives::Lock cache_lock_; + mutable sync_primitives::RecursiveLock cache_lock_; sync_primitives::Lock unpaired_lock_; typedef std::map<std::string, Permissions> AppCalculatedPermissions; |