Merge pull request #223 from RachikAbidi/patch-1

lucdion · web-flow · commit 4a998ef74309 · 2023-04-12T18:40:13.000-04:00
Fix xcodebuild with swift 5.8
diff --git a/Sources/yoga/Yoga.cpp b/Sources/yoga/Yoga.cpp
@@ -1899,7 +1899,7 @@ static float YGDistributeFreeSpaceSecondPass(
         "flex",
         config);
     node->setLayoutHadOverflow(
-        node->getLayout().hadOverflow |
+        node->getLayout().hadOverflow ||
         currentRelativeChild->getLayout().hadOverflow);
   }
   return deltaFreeSpace;

Original file line number	Diff line number	Diff line change
`@@ -1899,7 +1899,7 @@ static float YGDistributeFreeSpaceSecondPass(`
`1899`	`1899`	`"flex",`
`1900`	`1900`	`config);`
`1901`	`1901`	`node->setLayoutHadOverflow(`
`1902`		`- node->getLayout().hadOverflow \|`
	`1902`	`+ node->getLayout().hadOverflow \|\|`
`1903`	`1903`	`currentRelativeChild->getLayout().hadOverflow);`
`1904`	`1904`	`}`
`1905`	`1905`	`return deltaFreeSpace;`