From 3d944fd91f0cf5c1dee2dc324ada21cccea0734c Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Thu, 19 Jun 2025 12:03:39 +0800 Subject: [PATCH] remove _USE_MATH_DEFINE Signed-off-by: Caoruihong --- BUILD.gn | 2 -- adapter/preview/build/config_windows.gni | 1 - advanced_ui_component/BUILD.gn | 2 -- component_ext/arc_alphabet_indexer/BUILD.gn | 1 - component_ext/arc_list/BUILD.gn | 1 - component_ext/arc_scroll_bar/BUILD.gn | 1 - component_ext/arc_swiper/BUILD.gn | 2 -- interfaces/inner_api/ace_kit/src/view/draw/modifier_adapter.h | 4 ---- interfaces/napi/kits/BUILD.gn | 2 -- test/mock/interfaces/mock_content_modifier.cpp | 3 ++- 10 files changed, 2 insertions(+), 17 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index bb6d9542a3b..ca903ec0d18 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -108,12 +108,10 @@ config("ace_config") { if (use_mingw_win) { cflags_cc += [ "-std=c++17" ] - defines += [ "_USE_MATH_DEFINES" ] } if (use_linux) { cflags_cc += [ "-std=c++17" ] - defines += [ "_USE_MATH_DEFINES" ] } ldflags = [] diff --git a/adapter/preview/build/config_windows.gni b/adapter/preview/build/config_windows.gni index 84554ef1ef4..1028362621e 100644 --- a/adapter/preview/build/config_windows.gni +++ b/adapter/preview/build/config_windows.gni @@ -17,7 +17,6 @@ import("preview_common.gni") # windows platform defines and configs defines += [ "WINDOWS_PLATFORM", - "_USE_MATH_DEFINES", "NOGDI", "U_CHARSET_IS_UTF8=1", "SK_BUILD_FOR_WIN", diff --git a/advanced_ui_component/BUILD.gn b/advanced_ui_component/BUILD.gn index ccd5aaa9de8..41bac647837 100644 --- a/advanced_ui_component/BUILD.gn +++ b/advanced_ui_component/BUILD.gn @@ -27,12 +27,10 @@ config("ace_napi_config") { defines = [] if (use_mingw_win) { cflags_cc += [ "-std=c++17" ] - defines += [ "_USE_MATH_DEFINES" ] } if (use_linux) { cflags_cc += [ "-std=c++17" ] - defines += [ "_USE_MATH_DEFINES" ] } if (is_mac) { diff --git a/component_ext/arc_alphabet_indexer/BUILD.gn b/component_ext/arc_alphabet_indexer/BUILD.gn index 1fb27fe76fa..6886a316165 100644 --- a/component_ext/arc_alphabet_indexer/BUILD.gn +++ b/component_ext/arc_alphabet_indexer/BUILD.gn @@ -87,7 +87,6 @@ ohos_shared_library("arcalphabetindexer") { if (use_mingw_win || use_linux) { cflags_cc += [ "-std=c++17" ] - defines += [ "_USE_MATH_DEFINES" ] } relative_install_dir = "module/arkui" diff --git a/component_ext/arc_list/BUILD.gn b/component_ext/arc_list/BUILD.gn index b5ed2e549d6..f668d402bbd 100755 --- a/component_ext/arc_list/BUILD.gn +++ b/component_ext/arc_list/BUILD.gn @@ -88,7 +88,6 @@ ohos_shared_library("arclist") { if (use_mingw_win || use_linux) { cflags_cc += [ "-std=c++17" ] - defines += [ "_USE_MATH_DEFINES" ] } relative_install_dir = "module/arkui" diff --git a/component_ext/arc_scroll_bar/BUILD.gn b/component_ext/arc_scroll_bar/BUILD.gn index fe68fa1085d..c86c09afe49 100644 --- a/component_ext/arc_scroll_bar/BUILD.gn +++ b/component_ext/arc_scroll_bar/BUILD.gn @@ -83,7 +83,6 @@ ohos_shared_library("arcscrollbar") { if (use_mingw_win || use_linux) { cflags_cc += [ "-std=c++17" ] - defines += [ "_USE_MATH_DEFINES" ] } relative_install_dir = "module/arkui" diff --git a/component_ext/arc_swiper/BUILD.gn b/component_ext/arc_swiper/BUILD.gn index e07e260578a..4b4f1acefdd 100644 --- a/component_ext/arc_swiper/BUILD.gn +++ b/component_ext/arc_swiper/BUILD.gn @@ -86,8 +86,6 @@ ohos_shared_library("arcswiper") { "-Os", ] - defines += [ "_USE_MATH_DEFINES" ] - relative_install_dir = "module/arkui" subsystem_name = ace_engine_subsystem part_name = ace_engine_part diff --git a/interfaces/inner_api/ace_kit/src/view/draw/modifier_adapter.h b/interfaces/inner_api/ace_kit/src/view/draw/modifier_adapter.h index 8a8b445d129..db227bf86fd 100644 --- a/interfaces/inner_api/ace_kit/src/view/draw/modifier_adapter.h +++ b/interfaces/inner_api/ace_kit/src/view/draw/modifier_adapter.h @@ -18,10 +18,6 @@ #include -#ifdef _USE_MATH_DEFINES -#undef _USE_MATH_DEFINES -#endif - #if defined(MODIFIER_NG) #include "render_service_client/core/modifier_ng/custom/rs_content_style_modifier.h" #else diff --git a/interfaces/napi/kits/BUILD.gn b/interfaces/napi/kits/BUILD.gn index a03d0b17f78..78375a7140a 100644 --- a/interfaces/napi/kits/BUILD.gn +++ b/interfaces/napi/kits/BUILD.gn @@ -29,12 +29,10 @@ config("ace_napi_config") { defines = [] if (use_mingw_win) { cflags_cc += [ "-std=c++17" ] - defines += [ "_USE_MATH_DEFINES" ] } if (use_linux) { cflags_cc += [ "-std=c++17" ] - defines += [ "_USE_MATH_DEFINES" ] } if (use_hilog) { diff --git a/test/mock/interfaces/mock_content_modifier.cpp b/test/mock/interfaces/mock_content_modifier.cpp index 96346d27b31..3887621e21a 100644 --- a/test/mock/interfaces/mock_content_modifier.cpp +++ b/test/mock/interfaces/mock_content_modifier.cpp @@ -29,6 +29,7 @@ void ContentModifier::InitAdapter() {} const std::shared_ptr& ContentModifier::GetRSModifier() const { - return nullptr; + static std::shared_ptr adapter; + return adapter; } } // namespace OHOS::Ace::Kit -- Gitee