diff options
author | Conlain Kelly <conlain.k@gmail.com> | 2018-06-18 13:08:41 -0400 |
---|---|---|
committer | Conlain Kelly <conlain.k@gmail.com> | 2018-06-18 13:08:41 -0400 |
commit | a767768447c9e7c7898b5b2847e54aa985fc5041 (patch) | |
tree | df8ef162e679d11de8e7115f495eedc3f87dbac3 /src/components/policy | |
parent | 0dec6ef21fdfd752e33b0364c9e50d27c736371e (diff) | |
download | sdl_core-a767768447c9e7c7898b5b2847e54aa985fc5041.tar.gz |
replace auto_ptr with unique_ptr, refactor device_apps_launcher.cc/.h
Diffstat (limited to 'src/components/policy')
-rw-r--r-- | src/components/policy/policy_external/test/sql_pt_representation_test.cc | 6 | ||||
-rw-r--r-- | src/components/policy/policy_regular/test/sql_pt_representation_test.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/components/policy/policy_external/test/sql_pt_representation_test.cc b/src/components/policy/policy_external/test/sql_pt_representation_test.cc index 0b0831eaad..a5589cc904 100644 --- a/src/components/policy/policy_external/test/sql_pt_representation_test.cc +++ b/src/components/policy/policy_external/test/sql_pt_representation_test.cc @@ -81,14 +81,14 @@ class SQLPTRepresentationTest : public SQLPTRepresentation, static const std::string kDatabaseName; static utils::dbms::SQLQuery* query_wrapper_; // Gtest can show message that this object doesn't destroyed - static std::auto_ptr<policy_handler_test::MockPolicySettings> + static std::unique_ptr<policy_handler_test::MockPolicySettings> policy_settings_; static void SetUpTestCase() { const std::string kAppStorageFolder = "storage_SQLPTRepresentationTest"; reps = new SQLPTRepresentation(in_memory_); ASSERT_TRUE(reps != NULL); - policy_settings_ = std::auto_ptr<policy_handler_test::MockPolicySettings>( + policy_settings_ = std::unique_ptr<policy_handler_test::MockPolicySettings>( new policy_handler_test::MockPolicySettings()); ON_CALL(*policy_settings_, app_storage_folder()) .WillByDefault(ReturnRef(kAppStorageFolder)); @@ -348,7 +348,7 @@ SQLPTRepresentation* SQLPTRepresentationTest::reps = 0; utils::dbms::SQLQuery* SQLPTRepresentationTest::query_wrapper_ = 0; const std::string SQLPTRepresentationTest::kDatabaseName = ":memory:"; const bool SQLPTRepresentationTest::in_memory_ = true; -std::auto_ptr<policy_handler_test::MockPolicySettings> +std::unique_ptr<policy_handler_test::MockPolicySettings> SQLPTRepresentationTest::policy_settings_; class SQLPTRepresentationTest2 : public ::testing::Test { diff --git a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc index a5f3741331..40dae10a4f 100644 --- a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc +++ b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc @@ -78,12 +78,12 @@ class SQLPTRepresentationTest : public SQLPTRepresentation, static const std::string kDatabaseName; static const std::string kAppStorageFolder; // Gtest can show message that this object doesn't destroyed - std::auto_ptr<NiceMock<MockPolicySettings> > policy_settings_; + std::unique_ptr<NiceMock<MockPolicySettings> > policy_settings_; void SetUp() OVERRIDE { file_system::CreateDirectory(kAppStorageFolder); reps = new SQLPTRepresentation; - policy_settings_ = std::auto_ptr<NiceMock<MockPolicySettings> >( + policy_settings_ = std::unique_ptr<NiceMock<MockPolicySettings> >( new NiceMock<MockPolicySettings>()); ON_CALL(*policy_settings_, app_storage_folder()) .WillByDefault(ReturnRef(kAppStorageFolder)); |