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

Revert D13597449: [Yoga][cleanup] Remove enum count macros

Browse Source 
Differential Revision:
D13597449

Original commit changeset: edcee225ada4

fbshipit-source-id: 1afc24833c8657a8a198bc4529d98c8f605b7fbd
This commit is contained in:
Amir Shalem
2019-01-10 23:48:36 -08:00
committed by Facebook Github Bot
parent 3467308874
commit 866bf101b2
7 changed files with 47 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
yoga/Yoga.cpp
View File

@@ -105,7 +105,7 @@ bool YGFloatIsUndefined(const float value) {
}
detail::CompactValue YGComputedEdgeValue(
const YGStyle::Edges& edges,
const facebook::yoga::detail::Values<YGEdgeCount>& edges,
YGEdge edge,
detail::CompactValue defaultValue) {
if (!edges[edge].isUndefined()) {
@@ -3546,12 +3546,14 @@ static const char* YGSpacer(const unsigned long level) {
static const char* YGMeasureModeName(
const YGMeasureMode mode,
const bool performLayout) {
constexpr auto N = enums::count<YGMeasureMode>();
const char* kMeasureModeNames[N] = {"UNDEFINED", "EXACTLY", "AT_MOST"};
const char* kLayoutModeNames[N] = {
"LAY_UNDEFINED", "LAY_EXACTLY", "LAY_AT_MOST"};
const char* kMeasureModeNames[YGMeasureModeCount] = {
"UNDEFINED", "EXACTLY", "AT_MOST"};
const char* kLayoutModeNames[YGMeasureModeCount] = {"LAY_UNDEFINED",
"LAY_EXACTLY",
"LAY_AT_"
"MOST"};
if (mode >= N) {
if (mode >= YGMeasureModeCount) {
return "";
}