From 727ee92de5b3ba7bb641f452482d7800f05131bd Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 13 Jul 2018 12:34:49 -0700 Subject: [PATCH] Tidy up YGFloatOptional further Summary: I missed these two things: inline default ctor, getValue() should return a float. Reviewed By: priteshrnandgaonkar Differential Revision: D8826640 fbshipit-source-id: e6324dea0268ef276e6fa1722e72dffb5241e676 --- ReactCommon/yoga/yoga/YGFloatOptional.cpp | 4 +--- ReactCommon/yoga/yoga/YGFloatOptional.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ReactCommon/yoga/yoga/YGFloatOptional.cpp b/ReactCommon/yoga/yoga/YGFloatOptional.cpp index ceee1dc2817..d3407fa23cb 100644 --- a/ReactCommon/yoga/yoga/YGFloatOptional.cpp +++ b/ReactCommon/yoga/yoga/YGFloatOptional.cpp @@ -20,9 +20,7 @@ YGFloatOptional::YGFloatOptional(float value) { } } -YGFloatOptional::YGFloatOptional() : value_(0), isUndefined_(true) {} - -const float& YGFloatOptional::getValue() const { +float YGFloatOptional::getValue() const { if (isUndefined_) { // Abort, accessing a value of an undefined float optional std::cerr << "Tried to get value of an undefined YGFloatOptional\n"; diff --git a/ReactCommon/yoga/yoga/YGFloatOptional.h b/ReactCommon/yoga/yoga/YGFloatOptional.h index d426d8491ec..114f3577a92 100644 --- a/ReactCommon/yoga/yoga/YGFloatOptional.h +++ b/ReactCommon/yoga/yoga/YGFloatOptional.h @@ -14,12 +14,12 @@ struct YGFloatOptional { public: explicit YGFloatOptional(float value); - explicit YGFloatOptional(); + explicit YGFloatOptional() : value_(0), isUndefined_(true) {} // Program will terminate if the value of an undefined is accessed. Please // make sure to check if the optional is defined before calling this function. // To check if float optional is defined, use `isUndefined()`. - const float& getValue() const; + float getValue() const; // Sets the value of float optional, and thus isUndefined is assigned false. void setValue(float val) {