From: Adeel Kazmi Date: Fri, 18 May 2018 16:08:36 +0000 (+0000) Subject: Merge "Fix some SVACE issues for yoga third-party code." into devel/master X-Git-Tag: dali_1.3.26~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a2a0b8577e0a8ac8f2c5180fe0557c68a069fdaa;hp=0177c96d4fdf9f9701775f4e5a17d28876993c88 Merge "Fix some SVACE issues for yoga third-party code." into devel/master --- diff --git a/dali-toolkit/third-party/yoga/YGLayout.cpp b/dali-toolkit/third-party/yoga/YGLayout.cpp index 6e367bd..86eaff5 100644 --- a/dali-toolkit/third-party/yoga/YGLayout.cpp +++ b/dali-toolkit/third-party/yoga/YGLayout.cpp @@ -30,7 +30,7 @@ YGLayout::YGLayout() didUseLegacyFlag(false), doesLegacyStretchFlagAffectsLayout(false) {} -bool YGLayout::operator==(YGLayout layout) const { +bool YGLayout::operator==(const YGLayout& layout) const { bool isEqual = YGFloatArrayEqual(position, layout.position) && YGFloatArrayEqual(dimensions, layout.dimensions) && YGFloatArrayEqual(margin, layout.margin) && @@ -60,6 +60,6 @@ bool YGLayout::operator==(YGLayout layout) const { return isEqual; } -bool YGLayout::operator!=(YGLayout layout) const { +bool YGLayout::operator!=(const YGLayout& layout) const { return !(*this == layout); } diff --git a/dali-toolkit/third-party/yoga/YGLayout.h b/dali-toolkit/third-party/yoga/YGLayout.h index 46ca130..a820746 100644 --- a/dali-toolkit/third-party/yoga/YGLayout.h +++ b/dali-toolkit/third-party/yoga/YGLayout.h @@ -37,6 +37,6 @@ struct YGLayout { YGLayout(); - bool operator==(YGLayout layout) const; - bool operator!=(YGLayout layout) const; + bool operator==(const YGLayout& layout) const; + bool operator!=(const YGLayout& layout) const; }; diff --git a/dali-toolkit/third-party/yoga/YGNode.cpp b/dali-toolkit/third-party/yoga/YGNode.cpp index 64a47d3..6ebc69c 100644 --- a/dali-toolkit/third-party/yoga/YGNode.cpp +++ b/dali-toolkit/third-party/yoga/YGNode.cpp @@ -436,7 +436,7 @@ YGNode::YGNode( YGMeasureFunc measure, YGBaselineFunc baseline, YGDirtiedFunc dirtied, - YGStyle style, + const YGStyle& style, const YGLayout& layout, uint32_t lineIndex, YGNodeRef owner, diff --git a/dali-toolkit/third-party/yoga/YGNode.h b/dali-toolkit/third-party/yoga/YGNode.h index 96541a5..186798b 100644 --- a/dali-toolkit/third-party/yoga/YGNode.h +++ b/dali-toolkit/third-party/yoga/YGNode.h @@ -49,7 +49,7 @@ struct YGNode { YGMeasureFunc measure, YGBaselineFunc baseline, YGDirtiedFunc dirtied, - YGStyle style, + const YGStyle& style, const YGLayout& layout, uint32_t lineIndex, YGNodeRef owner, diff --git a/dali-toolkit/third-party/yoga/YGStyle.cpp b/dali-toolkit/third-party/yoga/YGStyle.cpp index 7664dcf..c11dc4e 100644 --- a/dali-toolkit/third-party/yoga/YGStyle.cpp +++ b/dali-toolkit/third-party/yoga/YGStyle.cpp @@ -99,7 +99,7 @@ bool YGStyle::operator==(const YGStyle& style) { return areNonFloatValuesEqual; } -bool YGStyle::operator!=(YGStyle style) { +bool YGStyle::operator!=(const YGStyle& style) { return !(*this == style); } diff --git a/dali-toolkit/third-party/yoga/YGStyle.h b/dali-toolkit/third-party/yoga/YGStyle.h index f0f97bd..0aaba54 100644 --- a/dali-toolkit/third-party/yoga/YGStyle.h +++ b/dali-toolkit/third-party/yoga/YGStyle.h @@ -38,6 +38,6 @@ struct YGStyle { // Yoga specific properties, not compatible with flexbox specification bool operator==(const YGStyle& style); - bool operator!=(YGStyle style); + bool operator!=(const YGStyle& style); ~YGStyle(); }; diff --git a/dali-toolkit/third-party/yoga/Yoga-internal.h b/dali-toolkit/third-party/yoga/Yoga-internal.h index be1d9632..17dd9ef 100644 --- a/dali-toolkit/third-party/yoga/Yoga-internal.h +++ b/dali-toolkit/third-party/yoga/Yoga-internal.h @@ -58,7 +58,7 @@ struct YGCachedMeasurement { computedWidth(-1), computedHeight(-1) {} - bool operator==(YGCachedMeasurement measurement) const { + bool operator==(const YGCachedMeasurement& measurement) const { bool isEqual = widthMeasureMode == measurement.widthMeasureMode && heightMeasureMode == measurement.heightMeasureMode;