From dc8c6adef0db238a3a2c6a24c52965375b09eb26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 14 Apr 2022 01:53:14 +0000 Subject: [PATCH 1/4] Signed-off-by: wuluofeng --- interfaces/kits/ability_lite/ability_loader.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/interfaces/kits/ability_lite/ability_loader.h b/interfaces/kits/ability_lite/ability_loader.h index e35e223..0fa105c 100644 --- a/interfaces/kits/ability_lite/ability_loader.h +++ b/interfaces/kits/ability_lite/ability_loader.h @@ -127,11 +127,13 @@ private: */ #ifdef ABILITY_WINDOW_SUPPORT #define REGISTER_AS(className) \ + do{\ __attribute__((constructor)) void RegisterAS##className() { \ AbilityLoader::GetInstance().RegisterAbilitySlice(#className, []()->AbilitySlice* { \ return new className; \ }); \ - } + }\ + }while(0) #endif } // namespace OHOS #endif // OHOS_ABILITY_LOADER_H \ No newline at end of file -- Gitee From 7edea54cdea5ec82e428e8bcc610ce1cde4fe910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 14 Apr 2022 02:50:35 +0000 Subject: [PATCH 2/4] Signed-off-by: wuluofeng --- interfaces/kits/ability_lite/ability_loader.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interfaces/kits/ability_lite/ability_loader.h b/interfaces/kits/ability_lite/ability_loader.h index 0fa105c..b34ec71 100644 --- a/interfaces/kits/ability_lite/ability_loader.h +++ b/interfaces/kits/ability_lite/ability_loader.h @@ -132,8 +132,7 @@ private: AbilityLoader::GetInstance().RegisterAbilitySlice(#className, []()->AbilitySlice* { \ return new className; \ }); \ - }\ - }while(0) + }}while(0) #endif } // namespace OHOS #endif // OHOS_ABILITY_LOADER_H \ No newline at end of file -- Gitee From 5dbf5bf7afd268e0aa33619ac633cc1be1ac55bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 14 Apr 2022 03:03:21 +0000 Subject: [PATCH 3/4] Signed-off-by: wuluofeng --- interfaces/kits/ability_lite/ability_loader.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/ability_lite/ability_loader.h b/interfaces/kits/ability_lite/ability_loader.h index b34ec71..942723d 100644 --- a/interfaces/kits/ability_lite/ability_loader.h +++ b/interfaces/kits/ability_lite/ability_loader.h @@ -127,12 +127,13 @@ private: */ #ifdef ABILITY_WINDOW_SUPPORT #define REGISTER_AS(className) \ - do{\ __attribute__((constructor)) void RegisterAS##className() { \ + do{\ AbilityLoader::GetInstance().RegisterAbilitySlice(#className, []()->AbilitySlice* { \ return new className; \ - }); \ - }}while(0) + }); \ + }while(0) \ + } #endif } // namespace OHOS #endif // OHOS_ABILITY_LOADER_H \ No newline at end of file -- Gitee From ce89fde20a354f047615ca6e46ed20d3ecee2f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 14 Apr 2022 03:19:55 +0000 Subject: [PATCH 4/4] Signed-off-by: wuluofeng --- interfaces/kits/ability_lite/ability_loader.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/ability_lite/ability_loader.h b/interfaces/kits/ability_lite/ability_loader.h index 942723d..314674c 100644 --- a/interfaces/kits/ability_lite/ability_loader.h +++ b/interfaces/kits/ability_lite/ability_loader.h @@ -129,9 +129,9 @@ private: #define REGISTER_AS(className) \ __attribute__((constructor)) void RegisterAS##className() { \ do{\ - AbilityLoader::GetInstance().RegisterAbilitySlice(#className, []()->AbilitySlice* { \ - return new className; \ - }); \ + AbilityLoader::GetInstance().RegisterAbilitySlice(#className, []()->AbilitySlice* { \ + return new className; \ + }); \ }while(0) \ } #endif -- Gitee