From: Caisking <3449750381@qq.com> Date: Sat, 19 Oct 2024 09:01:05 +0000 (+0800) Subject: 修复编译问题 X-Git-Tag: release_V1.2.70_20241020_135402~8 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=e7cb80d5153fcb5c7d6c154c87ecb666aca381b1;p=mirrors%2FFD230.git 修复编译问题 --- diff --git a/code/sdk/middleware/services/gui/uikit/ui/frameworks/font/ui_font_allocator.h b/code/sdk/middleware/services/gui/uikit/ui/frameworks/font/ui_font_allocator.h index a8467593d..f7b624a79 100755 --- a/code/sdk/middleware/services/gui/uikit/ui/frameworks/font/ui_font_allocator.h +++ b/code/sdk/middleware/services/gui/uikit/ui/frameworks/font/ui_font_allocator.h @@ -20,7 +20,7 @@ namespace OHOS { class UIFontAllocator { - static constexpr uint8_t MEM_ALIGNMENT = 4; + static constexpr uint8_t UI_MEM_ALIGNMENT = 4; struct Chunk { uint32_t next; @@ -52,7 +52,7 @@ public: private: uint32_t AlignSize(uint32_t size) { - return (size + MEM_ALIGNMENT - 1U) & ~(MEM_ALIGNMENT - 1U); + return (size + UI_MEM_ALIGNMENT - 1U) & ~(UI_MEM_ALIGNMENT - 1U); } void CombineFree(Chunk* cache);