Fix include directive to solve redefinition error (#44891)

Summary: Pull Request resolved: #44891 Changelog: [Internal] Reviewed By: cortinico, fabriziocucci, cipolleschi Differential Revision: D58459144 fbshipit-source-id: a07280de01c9ff4333e5140c6b741d88c1c5d89a
facebook · Jun 12, 2024 · c92f31d · c92f31d
1 parent 33aa83a
commit c92f31d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/...react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h b/...react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
@@ -9,13 +9,13 @@
 
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/LongLivedObject.h>
 #include <ReactCommon/NativeMethodCallInvokerHolder.h>
 #include <ReactCommon/RuntimeExecutor.h>
 #include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModuleManagerDelegate.h>
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
+#include <react/bridging/LongLivedObject.h>
 #include <react/jni/CxxModuleWrapper.h>
 #include <react/jni/JRuntimeExecutor.h>
 #include <memory>

diff --git a/packages/react-native/ReactCommon/react/bridging/Base.h b/packages/react-native/ReactCommon/react/bridging/Base.h
@@ -7,17 +7,17 @@
 
 #pragma once
 
-#include <react/bridging/Convert.h>
-
-#include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
+#include <react/bridging/Convert.h>
 
 #include <cstdint>
 #include <memory>
 #include <type_traits>
 
 namespace facebook::react {
 
+class CallInvoker;
+
 template <typename T, typename = void>
 struct Bridging;
 

diff --git a/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h b/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h
@@ -11,12 +11,12 @@
 
 #include <memory>
 
-#include <ReactCommon/CallInvoker.h>
-
-#include "LongLivedObject.h"
+#include <react/bridging/LongLivedObject.h>
 
 namespace facebook::react {
 
+class CallInvoker;
+
 // Helper for passing jsi::Function arg to other methods.
 class CallbackWrapper : public LongLivedObject {
  private:

diff --git a/packages/react-native/ReactCommon/react/bridging/Function.h b/packages/react-native/ReactCommon/react/bridging/Function.h
@@ -10,6 +10,7 @@
 #include <react/bridging/Base.h>
 #include <react/bridging/CallbackWrapper.h>
 
+#include <ReactCommon/CallInvoker.h>
 #include <ReactCommon/SchedulerPriority.h>
 
 namespace facebook::react {

diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
@@ -9,9 +9,10 @@
 
 #include <string>
 
-#include <ReactCommon/LongLivedObject.h>
-#include <ReactCommon/TurboModule.h>
 #include <jsi/jsi.h>
+#include <react/bridging/LongLivedObject.h>
+
+#include <ReactCommon/TurboModule.h>
 
 namespace facebook::react {
 

diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
@@ -11,9 +11,8 @@
 #include <string>
 
 #include <jsi/jsi.h>
-
-#include <ReactCommon/CallInvoker.h>
-#include <ReactCommon/CallbackWrapper.h>
+#include <react/bridging/CallbackWrapper.h>
+#include <react/bridging/LongLivedObject.h>
 
 namespace facebook::react {