Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use std::optional instead of butter::optional

Browse Source 
Summary: changelog: Use std::optional instead of butter::optional

Reviewed By: fkgozali

Differential Revision: D33352680

fbshipit-source-id: 45a53fec181a6ffb6218909bc23348f7c9f21ec4
This commit is contained in:
Samuel Susla
2022-03-04 07:25:59 -08:00
committed by Facebook GitHub Bot
parent c2e4ae39b8
commit a159416333
40 changed files with 155 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h
+5 -4
View File
@@ -13,6 +13,8 @@
#include <react/renderer/mapbuffer/MapBuffer.h>
#include <react/renderer/mapbuffer/MapBufferBuilder.h>
#include <optional>
namespace facebook {
namespace react {
@@ -122,7 +124,7 @@ MapBuffer convertAccessibilityState(AccessibilityState const &state) {
inline void putOptionalColor(
MapBufferBuilder &builder,
MapBuffer::Key key,
butter::optional<SharedColor> const &color) {
std::optional<SharedColor> const &color) {
builder.putInt(key, color.has_value() ? toAndroidRepr(color.value()) : -1);
}
@@ -159,7 +161,7 @@ constexpr MapBuffer::Key CORNER_ALL = 8;
inline void putOptionalFloat(
MapBufferBuilder &builder,
MapBuffer::Key key,
butter::optional<Float> const &value) {
std::optional<Float> const &value) {
builder.putDouble(key, value.value_or(NAN));
}
@@ -213,8 +215,7 @@ constexpr MapBuffer::Key NATIVE_DRAWABLE_COLOR = 2;
constexpr MapBuffer::Key NATIVE_DRAWABLE_BORDERLESS = 3;
constexpr MapBuffer::Key NATIVE_DRAWABLE_RIPPLE_RADIUS = 4;
MapBuffer convertNativeBackground(
butter::optional<NativeDrawable> const &value) {
MapBuffer convertNativeBackground(std::optional<NativeDrawable> const &value) {
if (!value.has_value()) {
return MapBufferBuilder::EMPTY();
}