diff options
| author | JackLivio <jack@livio.io> | 2018-10-19 15:05:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 15:05:09 -0400 |
| commit | d36316738785c96dab2ee892762ed08c059fffde (patch) | |
| tree | 168a7c0705b5bc8f0dee7ce4b511ccf71759d9b4 /src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h | |
| parent | 7f7fcbb998fb17f2954fd103349af67ea9b71a3f (diff) | |
| parent | 83c5e805346d55ec7fb9f4ba8b6f6855d992273e (diff) | |
| download | sdl_core-hotfix/templates_updates.tar.gz | |
Merge pull request #2572 from smartdevicelink/release/5.0.05.0.0hotfix/templates_updatesfeature/show_app_menufeature/progress_bar_seekfeature/open-menu-rpcfeature/open-menu-rfeature/button
Release 5.0.0
Diffstat (limited to 'src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h')
| -rw-r--r-- | src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h b/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h index e753751308..23701e86de 100644 --- a/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h +++ b/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h @@ -54,7 +54,7 @@ using ::policy::PolicyManagerImpl; typedef std::multimap<std::string, policy_table::Rpcs&> UserConsentPromptToRpcsConnections; -typedef utils::SharedPtr<policy_table::Table> PolicyTableSPtr; +typedef std::shared_ptr<policy_table::Table> PolicyTableSPtr; namespace { const std::string kSdlPreloadedPtJson = "json/sdl_preloaded_pt.json"; @@ -203,7 +203,7 @@ class PolicyManagerImplTest2 : public ::testing::Test { void EmulatePTAppRevoked(const std::string& ptu_name); - utils::SharedPtr<policy_table::Table> PreconditionForBasicValidateSnapshot(); + std::shared_ptr<policy_table::Table> PreconditionForBasicValidateSnapshot(); template <typename ParentType, typename Value> bool IsKeyExisted(const ParentType& parent, const Value& value) const { @@ -236,7 +236,7 @@ class PolicyManagerImplTest_RequestTypes : public ::testing::Test { const std::string app_storage_folder_; const std::string preloaded_pt_filename_; - utils::SharedPtr<PolicyManagerImpl> policy_manager_impl_sptr_; + std::shared_ptr<PolicyManagerImpl> policy_manager_impl_sptr_; NiceMock<MockPolicyListener> listener_; NiceMock<policy_handler_test::MockPolicySettings> policy_settings_; |