From 51051aad7f48f0ced7c851677c95e2c20adac0ea Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Tue, 20 Feb 2018 05:41:52 -0800 Subject: [PATCH] Added default constructor for YGCachedMeasurement Summary: Added default constructor for YGCachedMeasurement. This diff uses the default initialiser to get rid off the older designated initializer syntax. This diff also addresses https://github.com/facebook/yoga/pull/700 Reviewed By: emilsjolander Differential Revision: D7020337 fbshipit-source-id: e084e234bf6a2ae22e53e739959683abca169b88 --- yoga/YGLayout.cpp | 9 +-------- yoga/Yoga-internal.h | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/yoga/YGLayout.cpp b/yoga/YGLayout.cpp index 8f00c0f3..66348fc2 100644 --- a/yoga/YGLayout.cpp +++ b/yoga/YGLayout.cpp @@ -26,14 +26,7 @@ YGLayout::YGLayout() nextCachedMeasurementsIndex(0), cachedMeasurements(), measuredDimensions(kYGDefaultDimensionValues), - cachedLayout({ - .availableWidth = 0, - .availableHeight = 0, - .widthMeasureMode = (YGMeasureMode)-1, - .heightMeasureMode = (YGMeasureMode)-1, - .computedWidth = -1, - .computedHeight = -1, - }), + cachedLayout(YGCachedMeasurement()), didUseLegacyFlag(false), doesLegacyStretchFlagAffectsLayout(false) {} diff --git a/yoga/Yoga-internal.h b/yoga/Yoga-internal.h index 43723df0..21b14b23 100644 --- a/yoga/Yoga-internal.h +++ b/yoga/Yoga-internal.h @@ -50,6 +50,14 @@ struct YGCachedMeasurement { float computedWidth; float computedHeight; + YGCachedMeasurement() + : availableWidth(0), + availableHeight(0), + widthMeasureMode((YGMeasureMode)-1), + heightMeasureMode((YGMeasureMode)-1), + computedWidth(-1), + computedHeight(-1) {} + bool operator==(YGCachedMeasurement measurement) const { bool isEqual = widthMeasureMode == measurement.widthMeasureMode && heightMeasureMode == measurement.heightMeasureMode;