From 01dcec401b903adcb7252cf7c9734cc9631d3bd4 Mon Sep 17 00:00:00 2001 From: Joshua Gross Date: Fri, 26 Feb 2021 23:26:05 -0800 Subject: [PATCH] ReactCommon/renderer/components/image: Migrate uses of NDEBUG to REACT_NATIVE_DEBUG + react_native_assert Summary: For better cross-platform consistency, migrate usages of NDEBUG to REACT_NATIVE_DEBUG. See flags.h for explanation. Changelog: [Internal] Reviewed By: PeteTheHeat Differential Revision: D26695038 fbshipit-source-id: afcf2aecad8305b112e1b4ddcc1693380f3defcc --- ReactCommon/react/renderer/components/image/BUCK | 1 + .../react/renderer/components/image/ImageComponentDescriptor.h | 3 ++- ReactCommon/react/renderer/components/image/conversions.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ReactCommon/react/renderer/components/image/BUCK b/ReactCommon/react/renderer/components/image/BUCK index f6288911bfe..512859a6e39 100644 --- a/ReactCommon/react/renderer/components/image/BUCK +++ b/ReactCommon/react/renderer/components/image/BUCK @@ -50,6 +50,7 @@ rn_xplat_cxx_library( "//xplat/folly:headers_only", "//xplat/folly:molly", YOGA_CXX_TARGET, + react_native_xplat_target("react/debug:debug"), react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("react/renderer/core:core"), react_native_xplat_target("react/renderer/graphics:graphics"), diff --git a/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h b/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h index 1e2b6708649..56bf1f18c35 100644 --- a/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h @@ -7,6 +7,7 @@ #pragma once +#include #include #include #include @@ -28,7 +29,7 @@ class ImageComponentDescriptor final void adopt(UnsharedShadowNode shadowNode) const override { ConcreteComponentDescriptor::adopt(shadowNode); - assert(std::dynamic_pointer_cast(shadowNode)); + react_native_assert(std::dynamic_pointer_cast(shadowNode)); auto imageShadowNode = std::static_pointer_cast(shadowNode); diff --git a/ReactCommon/react/renderer/components/image/conversions.h b/ReactCommon/react/renderer/components/image/conversions.h index a77d40fad48..fa1dd602161 100644 --- a/ReactCommon/react/renderer/components/image/conversions.h +++ b/ReactCommon/react/renderer/components/image/conversions.h @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -88,7 +89,7 @@ inline std::string toString(const ImageSource &value) { } inline void fromRawValue(const RawValue &value, ImageResizeMode &result) { - assert(value.hasType()); + react_native_assert(value.hasType()); auto stringValue = (std::string)value; if (stringValue == "cover") { result = ImageResizeMode::Cover;