diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp index 5099a2467b3abf..f5f66c7cd2279a 100644 --- a/ReactCommon/yoga/yoga/YGNode.cpp +++ b/ReactCommon/yoga/yoga/YGNode.cpp @@ -385,7 +385,7 @@ void YGNode::cloneChildrenIfNeeded() { // YGNodeRemoveChild in yoga.cpp has a forked variant of this algorithm // optimized for deletions. - const uint32_t childCount = children_.size(); + const uint32_t childCount = static_cast(children_.size()); if (childCount == 0) { // This is an empty set. Nothing to clone. return; diff --git a/ReactCommon/yoga/yoga/YGNodePrint.cpp b/ReactCommon/yoga/yoga/YGNodePrint.cpp index e49903acc92328..0951e955a93e39 100644 --- a/ReactCommon/yoga/yoga/YGNodePrint.cpp +++ b/ReactCommon/yoga/yoga/YGNodePrint.cpp @@ -212,7 +212,7 @@ void YGNodeToString( } appendFormatedString(str, ">"); - const uint32_t childCount = node->getChildren().size(); + const uint32_t childCount = static_cast(node->getChildren().size()); if (options & YGPrintOptionsChildren && childCount > 0) { for (uint32_t i = 0; i < childCount; i++) { appendFormatedString(str, "\n"); diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp index 186c6ce46915ac..f4bae13ddb30e8 100644 --- a/ReactCommon/yoga/yoga/Yoga.cpp +++ b/ReactCommon/yoga/yoga/Yoga.cpp @@ -321,7 +321,9 @@ YGConfigRef YGConfigGetDefault() { YGConfigRef YGConfigNew(void) { const YGConfigRef config = (const YGConfigRef)malloc(sizeof(YGConfig)); YGAssert(config != nullptr, "Could not allocate memory for config"); - + if (config == nullptr) { + abort(); + } gConfigInstanceCount++; memcpy(config, &gYGConfigDefaults, sizeof(YGConfig)); return config; @@ -433,7 +435,7 @@ YGNodeRef YGNodeGetChild(const YGNodeRef node, const uint32_t index) { } uint32_t YGNodeGetChildCount(const YGNodeRef node) { - return node->getChildren().size(); + return static_cast(node->getChildren().size()); } YGNodeRef YGNodeGetParent(const YGNodeRef node) { @@ -1895,7 +1897,7 @@ static void YGNodelayoutImpl(const YGNodeRef node, return; } - const uint32_t childCount = node->getChildren().size(); + const uint32_t childCount = YGNodeGetChildCount(node); if (childCount == 0) { YGNodeEmptyContainerSetMeasuredDimensions(node, availableWidth, @@ -3556,7 +3558,7 @@ static void YGRoundToPixelGrid(const YGNodeRef node, absoluteNodeTop, pointScaleFactor, false, textRounding), YGDimensionHeight); - const uint32_t childCount = node->getChildren().size(); + const uint32_t childCount = YGNodeGetChildCount(node); for (uint32_t i = 0; i < childCount; i++) { YGRoundToPixelGrid(YGNodeGetChild(node, i), pointScaleFactor, absoluteNodeLeft, absoluteNodeTop); }