DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Fix problems with GCC < v8

Browse Source 
Summary:
@public

GCC up until v7 flags our way of reading edges in `YGNodeSetStyleInputs` as unused variables. I managed to work around that by rearranging the casts a bit.

Reviewed By: SidharthGuglani

Differential Revision: D14299439

fbshipit-source-id: eec0266185504d1b790b9ef574bd4a83c0059d3a
This commit is contained in:
David Aurelio
2019-03-04 02:34:33 -08:00
committed by Facebook Github Bot
parent 88994129ae
commit a9bddf87ff
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
java/jni/YGJNI.cpp
View File

@@ -755,18 +755,17 @@ static void YGNodeSetStyleInputs(
YGNodeStyleSetDisplay(node, static_cast<YGDisplay>(*styleInputs++));
break;
case Margin: {
float edge = *styleInputs++;
auto edge = static_cast<YGEdge>(*styleInputs++);
float marginValue = *styleInputs++;
ygNodeRefToYGNodeContext(node)->edgeSetFlag |= MARGIN;
YGNodeStyleSetMargin(node, static_cast<YGEdge>(edge), marginValue);
YGNodeStyleSetMargin(node, edge, marginValue);
break;
}
case MarginPercent: {
float edge = *styleInputs++;
auto edge = static_cast<YGEdge>(*styleInputs++);
float marginPercent = *styleInputs++;
ygNodeRefToYGNodeContext(node)->edgeSetFlag |= MARGIN;
YGNodeStyleSetMarginPercent(
node, static_cast<YGEdge>(edge), marginPercent);
YGNodeStyleSetMarginPercent(node, edge, marginPercent);
break;
}
case MarginAuto: {
@@ -775,38 +774,36 @@ static void YGNodeSetStyleInputs(
break;
}
case Padding: {
float edge = *styleInputs++;
auto edge = static_cast<YGEdge>(*styleInputs++);
float paddingValue = *styleInputs++;
ygNodeRefToYGNodeContext(node)->edgeSetFlag |= PADDING;
YGNodeStyleSetPadding(node, static_cast<YGEdge>(edge), paddingValue);
YGNodeStyleSetPadding(node, edge, paddingValue);
break;
}
case PaddingPercent: {
float edge = *styleInputs++;
auto edge = static_cast<YGEdge>(*styleInputs++);
float paddingPercent = *styleInputs++;
ygNodeRefToYGNodeContext(node)->edgeSetFlag |= PADDING;
YGNodeStyleSetPaddingPercent(
node, static_cast<YGEdge>(edge), paddingPercent);
YGNodeStyleSetPaddingPercent(node, edge, paddingPercent);
break;
}
case Border: {
float edge = *styleInputs++;
auto edge = static_cast<YGEdge>(*styleInputs++);
float borderValue = *styleInputs++;
ygNodeRefToYGNodeContext(node)->edgeSetFlag |= BORDER;
YGNodeStyleSetBorder(node, static_cast<YGEdge>(edge), borderValue);
YGNodeStyleSetBorder(node, edge, borderValue);
break;
}
case Position: {
float edge = *styleInputs++;
auto edge = static_cast<YGEdge>(*styleInputs++);
float positionValue = *styleInputs++;
YGNodeStyleSetPosition(node, static_cast<YGEdge>(edge), positionValue);
YGNodeStyleSetPosition(node, edge, positionValue);
break;
}
case PositionPercent: {
float edge = *styleInputs++;
auto edge = static_cast<YGEdge>(*styleInputs++);
float positionPercent = *styleInputs++;
YGNodeStyleSetPositionPercent(
node, static_cast<YGEdge>(edge), positionPercent);
YGNodeStyleSetPositionPercent(node, edge, positionPercent);
break;
}
case IsReferenceBaseline: {