diff --git a/yoga/YGNodePrint.cpp b/yoga/YGNodePrint.cpp index 753a00b6..03bff15a 100644 --- a/yoga/YGNodePrint.cpp +++ b/yoga/YGNodePrint.cpp @@ -20,7 +20,8 @@ static void indent(string& base, uint32_t level) { } } -static bool areFourValuesEqual(const std::array& four) { +static bool areFourValuesEqual( + const facebook::yoga::detail::Values& four) { return YGValueEqual(four[0], four[1]) && YGValueEqual(four[0], four[2]) && YGValueEqual(four[0], four[3]); } @@ -81,7 +82,7 @@ appendNumberIfNotZero(string& base, const string& str, const YGValue number) { static void appendEdges( string& base, const string& key, - const std::array& edges) { + const facebook::yoga::detail::Values& edges) { if (areFourValuesEqual(edges)) { appendNumberIfNotZero(base, key, edges[YGEdgeLeft]); } else { @@ -95,7 +96,7 @@ static void appendEdges( static void appendEdgeIfNotUndefined( string& base, const string& str, - const std::array& edges, + const facebook::yoga::detail::Values& edges, const YGEdge edge) { appendNumberIfNotUndefined( base, str, *YGComputedEdgeValue(edges, edge, &YGValueUndefined)); diff --git a/yoga/Yoga-internal.h b/yoga/Yoga-internal.h index cc4da004..719d7b37 100644 --- a/yoga/Yoga-internal.h +++ b/yoga/Yoga-internal.h @@ -103,12 +103,6 @@ class Values { values_.fill(defaultValue); } - operator const std::array&() const noexcept { - return values_; - } - operator std::array&() noexcept { - return values_; - } const YGValue& operator[](size_t i) const noexcept { return values_[i]; } @@ -136,10 +130,6 @@ class Values { } Values& operator=(const Values& other) = default; - Values& operator=(const std::array& other) noexcept { - values_ = other; - return *this; - } }; } // namespace detail @@ -153,6 +143,6 @@ static const float kWebDefaultFlexShrink = 1.0f; extern bool YGFloatsEqual(const float a, const float b); extern bool YGValueEqual(const YGValue a, const YGValue b); extern const YGValue* YGComputedEdgeValue( - const std::array& edges, + const facebook::yoga::detail::Values& edges, const YGEdge edge, const YGValue* const defaultValue); diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp index 4a1a98a2..beb01c59 100644 --- a/yoga/Yoga.cpp +++ b/yoga/Yoga.cpp @@ -103,7 +103,7 @@ bool YGFloatIsUndefined(const float value) { } const YGValue* YGComputedEdgeValue( - const std::array& edges, + const facebook::yoga::detail::Values& edges, const YGEdge edge, const YGValue* const defaultValue) { if (edges[edge].unit != YGUnitUndefined) {