diff --git a/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.cpp b/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.cpp index 9f6897f2613308..620b678cd804a2 100644 --- a/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.cpp +++ b/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.cpp @@ -53,7 +53,7 @@ uint32_t PerformanceEntryReporter::getDroppedEntriesCount( PerformanceEntryType entryType) const noexcept { std::shared_lock lock(buffersMutex_); - return getBuffer(entryType).droppedEntriesCount; + return (uint32_t)getBuffer(entryType).droppedEntriesCount; } std::vector PerformanceEntryReporter::getEntries() const { diff --git a/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.h b/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.h index 956bb8d0071c37..71526197456bad 100644 --- a/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.h +++ b/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.h @@ -125,6 +125,7 @@ class PerformanceEntryReporter { case PerformanceEntryType::_NEXT: throw std::logic_error("Cannot get buffer for _NEXT entry type"); } + throw std::logic_error("Unhandled PerformanceEntryType"); } inline PerformanceEntryBuffer& getBufferRef(PerformanceEntryType entryType) { @@ -140,6 +141,7 @@ class PerformanceEntryReporter { case PerformanceEntryType::_NEXT: throw std::logic_error("Cannot get buffer for _NEXT entry type"); } + throw std::logic_error("Unhandled PerformanceEntryType"); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp index df2adf005c64db..674c0e2c921621 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp @@ -117,7 +117,7 @@ ScrollViewProps::ScrollViewProps( rawProps, "endDraggingSensitivityMultiplier", sourceProps.endDraggingSensitivityMultiplier, - 1)), + (Float)1)), enableSyncOnScroll( CoreFeatures::enablePropIteratorSetter ? sourceProps.enableSyncOnScroll