diff --git a/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp b/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp index b3d15a925f752146e70946d47c3045f201d95f42..2aab421e634929313866b8096a3a946bec094b44 100644 --- a/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp +++ b/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp @@ -35,7 +35,8 @@ AppManagerAccessClient& AppManagerAccessClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AppManagerAccessClient(); + AppManagerAccessClient* tmp = new AppManagerAccessClient(); + instance = std::move(tmp); } } return *instance; diff --git a/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp b/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp index 1d1eeed0701f0df45c31bee3cc0ebd93e4852a6a..bc7133304de4a581618042f69857acf774807732 100644 --- a/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp +++ b/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp @@ -34,7 +34,8 @@ TokenSyncManagerClient& TokenSyncManagerClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new TokenSyncManagerClient(); + TokenSyncManagerClient* tmp = new TokenSyncManagerClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp b/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp index 4de67687d6b301f0e3f3804fc08a5227d95b3e3e..bdb2c10c17dea03d946258274d181c9244d935b1 100644 --- a/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp @@ -43,7 +43,8 @@ CallbackManager& CallbackManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new CallbackManager(); + CallbackManager* tmp = new CallbackManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp b/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp index 3ec9e117abeed957499db02b0569cd030364e9dc..9b89af5e44abd3118fda8a145c8c7f6779d83554 100644 --- a/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp +++ b/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp @@ -43,7 +43,8 @@ AccessTokenDb& AccessTokenDb::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AccessTokenDb(); + AccessTokenDb* tmp = new AccessTokenDb(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp b/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp index 715cacbbc6f786066a1853ebc22d5923d86c138d..b3ba7baecf28b3fe779530e721865a131e7f2e02 100644 --- a/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp +++ b/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp @@ -35,7 +35,8 @@ FormManagerAccessClient& FormManagerAccessClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new FormManagerAccessClient(); + FormManagerAccessClient* tmp = new FormManagerAccessClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp index 2efc2cc774ab8822d83c43016d27dc388f0c6e10..23796da98fee41b50defbb670c77edf61f816017 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp @@ -37,7 +37,8 @@ DlpPermissionSetManager& DlpPermissionSetManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new DlpPermissionSetManager(); + DlpPermissionSetManager* tmp = new DlpPermissionSetManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_parser.cpp b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_parser.cpp index 4752ecf381f7cbb8db4a8b4b0fdeffa53c40cc12..90bb8f0bde724917b9a7b05e63e013b55575698d 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_parser.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_parser.cpp @@ -150,7 +150,8 @@ DlpPermissionSetParser& DlpPermissionSetParser::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new DlpPermissionSetParser(); + DlpPermissionSetParser* tmp = new DlpPermissionSetParser(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp index e8258efa6a8f4880210bcf82200f8ada1657c4f3..32ad42a26b7fb24923543664f1ca89fea8881a17 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp @@ -38,7 +38,8 @@ PermissionDataBrief& PermissionDataBrief::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_briefInstanceMutex); if (instance == nullptr) { - instance = new PermissionDataBrief(); + PermissionDataBrief* tmp = new PermissionDataBrief(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp index 0da324628c3cb93bc1101489a0879f5424f3545c..71d4315b63f3cc3008a336e2599e9ebf7ebbc507 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp @@ -38,7 +38,8 @@ PermissionDefinitionCache& PermissionDefinitionCache::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PermissionDefinitionCache(); + PermissionDefinitionCache* tmp = new PermissionDefinitionCache(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp index b33ff436c7f918a1b1a168bd2d4581a567c097e8..814af2e21232f8432b2adc7bf7ae1314907a8326 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp @@ -268,7 +268,8 @@ PermissionDefinitionParser& PermissionDefinitionParser::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PermissionDefinitionParser(); + PermissionDefinitionParser* tmp = new PermissionDefinitionParser(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp index f3a2a3ef71397a835a511688f6a151a52aaaaf49..b6204f5de3f1f9d9a031a5f04ca9525628c0f33a 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp @@ -42,7 +42,8 @@ ShortGrantManager& ShortGrantManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new ShortGrantManager(); + ShortGrantManager* tmp = new ShortGrantManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp index 25f86293dc52e471ded2b3c6ecabb9673a33801a..3f62ade578295bdcaaf2e64cc2caeb31bfb3bc65 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp @@ -59,7 +59,8 @@ TempPermissionObserver& TempPermissionObserver::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new TempPermissionObserver(); + TempPermissionObserver* tmp = new TempPermissionObserver(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp index 74cd02e0fc4ab55c398ec8550b41c9a23992cb13..74acedbf83b2b43460dca44c635f480851b21f26 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp @@ -137,7 +137,8 @@ AccessTokenIDManager& AccessTokenIDManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AccessTokenIDManager(); + AccessTokenIDManager* tmp = new AccessTokenIDManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp index e8e941b456ecec33ea40abb20d933d903bd01023..6e9398312f47236fb6b705cd9b466e4652d6b643 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp @@ -1021,7 +1021,8 @@ AccessTokenInfoManager& AccessTokenInfoManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AccessTokenInfoManager(); + AccessTokenInfoManager* tmp = new AccessTokenInfoManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp index c72c418a77b9c88b14f3018847a9d26f033881e9..4400f338b19d372c254158891c9d97043dff485a 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp @@ -41,7 +41,8 @@ AccessTokenRemoteTokenManager& AccessTokenRemoteTokenManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AccessTokenRemoteTokenManager(); + AccessTokenRemoteTokenManager* tmp = new AccessTokenRemoteTokenManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp index 51132d7a838e6bb3e11eeb6f05ddb117c8d3bbe8..14de978ae2a9e52dad10971209969e56beab17fe 100644 --- a/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp @@ -183,7 +183,8 @@ NativeTokenReceptor& NativeTokenReceptor::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new NativeTokenReceptor(); + NativeTokenReceptor* tmp = new NativeTokenReceptor(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp index bf9ad06e563e1a490547b778dbad3e286b0d44c3..612db78c1475f8045e9b2827210e769b9f4a80a6 100644 --- a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp @@ -91,7 +91,8 @@ TokenModifyNotifier& TokenModifyNotifier::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new TokenModifyNotifier(); + TokenModifyNotifier* tmp = new TokenModifyNotifier(); + instance = std::move(tmp); } } diff --git a/services/common/app_manager/src/app_manager_access_client.cpp b/services/common/app_manager/src/app_manager_access_client.cpp index 4d7c1eedb7124e24bf016ae633a82928f70eda00..000c031532df8d6e058b03793c34830f5ba621a4 100644 --- a/services/common/app_manager/src/app_manager_access_client.cpp +++ b/services/common/app_manager/src/app_manager_access_client.cpp @@ -35,7 +35,8 @@ AppManagerAccessClient& AppManagerAccessClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AppManagerAccessClient(); + AppManagerAccessClient* tmp = new AppManagerAccessClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/common/background_task_manager/src/background_task_manager_access_client.cpp b/services/common/background_task_manager/src/background_task_manager_access_client.cpp index 552672899fdbbbac743da29cde9ca361c910c2b5..4307b3c4dd97fd4f0a091c563a55b2e714855b5f 100644 --- a/services/common/background_task_manager/src/background_task_manager_access_client.cpp +++ b/services/common/background_task_manager/src/background_task_manager_access_client.cpp @@ -35,7 +35,8 @@ BackgourndTaskManagerAccessClient& BackgourndTaskManagerAccessClient::GetInstanc if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new BackgourndTaskManagerAccessClient(); + BackgourndTaskManagerAccessClient* tmp = new BackgourndTaskManagerAccessClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/common/window_manager/src/privacy_window_manager_client.cpp b/services/common/window_manager/src/privacy_window_manager_client.cpp index 2b07a1554a5790eb837395ee0f21eb3bb4755916..f7e2a59e7bcc7d749e13a9fed5b95ebaf21a9f92 100644 --- a/services/common/window_manager/src/privacy_window_manager_client.cpp +++ b/services/common/window_manager/src/privacy_window_manager_client.cpp @@ -44,7 +44,8 @@ PrivacyWindowManagerClient& PrivacyWindowManagerClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PrivacyWindowManagerClient(); + PrivacyWindowManagerClient* tmp = new PrivacyWindowManagerClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/privacymanager/src/active/active_status_callback_manager.cpp b/services/privacymanager/src/active/active_status_callback_manager.cpp index 35c265f8954b5f4131a2a4efb48bbe131bdd99d0..7320b6c461f37af55d24e5a5e7c5c9fc39415894 100644 --- a/services/privacymanager/src/active/active_status_callback_manager.cpp +++ b/services/privacymanager/src/active/active_status_callback_manager.cpp @@ -41,7 +41,8 @@ ActiveStatusCallbackManager& ActiveStatusCallbackManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new ActiveStatusCallbackManager(); + ActiveStatusCallbackManager* tmp = new ActiveStatusCallbackManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/privacymanager/src/record/permission_record_manager.cpp b/services/privacymanager/src/record/permission_record_manager.cpp index ca0d52880df1eb4c8252333186deee9e1d29fc34..95a09ecf1daed982bf25e18b47e725dcec2e7101 100644 --- a/services/privacymanager/src/record/permission_record_manager.cpp +++ b/services/privacymanager/src/record/permission_record_manager.cpp @@ -84,7 +84,8 @@ PermissionRecordManager& PermissionRecordManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PermissionRecordManager(); + PermissionRecordManager* tmp = new PermissionRecordManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/privacymanager/src/seccomp/privacy_sec_comp_enhance_agent.cpp b/services/privacymanager/src/seccomp/privacy_sec_comp_enhance_agent.cpp index 7c5ccc12bf08b7a98953843cf8219ae93bee8538..9faaa1a8c860ecc370b67b1ddf2a7e819b447307 100644 --- a/services/privacymanager/src/seccomp/privacy_sec_comp_enhance_agent.cpp +++ b/services/privacymanager/src/seccomp/privacy_sec_comp_enhance_agent.cpp @@ -50,7 +50,8 @@ PrivacySecCompEnhanceAgent& PrivacySecCompEnhanceAgent::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PrivacySecCompEnhanceAgent(); + PrivacySecCompEnhanceAgent* tmp = new PrivacySecCompEnhanceAgent(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/device/device_info_manager.cpp b/services/tokensyncmanager/src/device/device_info_manager.cpp index 2e98f0bbade22f2664640d6138ed5a93a4ebdc27..f8783d04008894c187ff5c66b47db7de42288aae 100644 --- a/services/tokensyncmanager/src/device/device_info_manager.cpp +++ b/services/tokensyncmanager/src/device/device_info_manager.cpp @@ -29,7 +29,8 @@ DeviceInfoManager &DeviceInfoManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new DeviceInfoManager(); + DeviceInfoManager* tmp = new DeviceInfoManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/device/device_info_repository.cpp b/services/tokensyncmanager/src/device/device_info_repository.cpp index 932e69144f1e506191895e2f174670de461ec8cf..e90690b0308089d3ca1b8187b6a62a7f3c013219 100644 --- a/services/tokensyncmanager/src/device/device_info_repository.cpp +++ b/services/tokensyncmanager/src/device/device_info_repository.cpp @@ -27,7 +27,8 @@ DeviceInfoRepository &DeviceInfoRepository::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new DeviceInfoRepository(); + DeviceInfoRepository* tmp = new DeviceInfoRepository(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/remote/remote_command_factory.cpp b/services/tokensyncmanager/src/remote/remote_command_factory.cpp index 67db3cc0fe682852b68c7666e8772a205efbc4fb..88ecff12441539a3d8cef5d9cc987bfbdd35ce6b 100644 --- a/services/tokensyncmanager/src/remote/remote_command_factory.cpp +++ b/services/tokensyncmanager/src/remote/remote_command_factory.cpp @@ -30,7 +30,8 @@ RemoteCommandFactory &RemoteCommandFactory::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new RemoteCommandFactory(); + RemoteCommandFactory* tmp = new RemoteCommandFactory(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/remote/remote_command_manager.cpp b/services/tokensyncmanager/src/remote/remote_command_manager.cpp index 8d0c6588b34dbcbe7f1b79665e0e9cbaba1dab91..98c77f07e862227bc15de2f657d7f5de7657e1e6 100644 --- a/services/tokensyncmanager/src/remote/remote_command_manager.cpp +++ b/services/tokensyncmanager/src/remote/remote_command_manager.cpp @@ -47,7 +47,8 @@ RemoteCommandManager &RemoteCommandManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new RemoteCommandManager(); + RemoteCommandManager* tmp = new RemoteCommandManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp index 86e1d08281d31d30e0f2d3b39e19d6f18e0f2d29..512e1a56d2009c642a1b5e2fe092e10e67daedb5 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp @@ -76,7 +76,8 @@ SoftBusManager &SoftBusManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new SoftBusManager(); + SoftBusManager* tmp = new SoftBusManager(); + instance = std::move(tmp); } } return *instance;