diff options
Diffstat (limited to 'src/ui/render/FlexLayoutRenderObject.cpp')
| -rw-r--r-- | src/ui/render/FlexLayoutRenderObject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp index 588c379b..efc98602 100644 --- a/src/ui/render/FlexLayoutRenderObject.cpp +++ b/src/ui/render/FlexLayoutRenderObject.cpp @@ -90,7 +90,7 @@ Size FlexLayoutMeasureContentImpl( const MeasureRequirement& requirement, const MeasureSize& preferred_size, const std::vector<RenderObject*>& children, const std::vector<FlexChildLayoutData>& layout_data, - Alignment item_cross_align, String kLogTag) { + Alignment item_cross_align, std::string kLogTag) { Expects(children.size() == layout_data.size()); direction_tag_t direction_tag; @@ -301,7 +301,7 @@ Size FlexLayoutMeasureContentImpl( if (max_main_length.IsSpecified() && total_length > max_main_length.GetLengthOrUndefined()) { CRU_LOG_TAG_WARN( - u"(Measure) Children's main axis length exceeds required max length."); + "(Measure) Children's main axis length exceeds required max length."); total_length = max_main_length.GetLengthOrUndefined(); } else if (min_main_length.IsSpecified() && total_length < min_main_length.GetLengthOrUndefined()) { |