From c67c7f998caa1ac75e238530cab8494d4b15f0e0 Mon Sep 17 00:00:00 2001
From: Li Feng <li.feng@snapchat.com>
Date: Thu, 22 Feb 2024 13:15:10 +1100
Subject: [PATCH] fix include paths

---
 support-lib/composer/DataRef_composer.cpp  | 1 -
 support-lib/composer/DataRef_composer.hpp  | 2 +-
 support-lib/composer/DataView_composer.hpp | 2 +-
 support-lib/composer/Future_composer.hpp   | 2 +-
 support-lib/composer/Outcome_composer.hpp  | 2 +-
 support-lib/jni/DataRef_jni.cpp            | 1 -
 support-lib/jni/DataRef_jni.hpp            | 2 +-
 support-lib/jni/DataView_jni.hpp           | 2 +-
 support-lib/jni/Future_jni.hpp             | 2 +-
 support-lib/jni/Outcome_jni.hpp            | 2 +-
 support-lib/objc/DataRef_objc.cpp          | 1 -
 support-lib/objc/DataRef_objc.hpp          | 2 +-
 support-lib/objc/DataView_objc.hpp         | 2 +-
 support-lib/objc/Outcome_objc.hpp          | 2 +-
 support-lib/wasm/DataRef_wasm.cpp          | 1 -
 support-lib/wasm/DataRef_wasm.hpp          | 2 +-
 support-lib/wasm/DataView_wasm.hpp         | 2 +-
 support-lib/wasm/Future_wasm.hpp           | 2 +-
 support-lib/wasm/Outcome_wasm.hpp          | 2 +-
 19 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/support-lib/composer/DataRef_composer.cpp b/support-lib/composer/DataRef_composer.cpp
index 64a12a3c..bae29404 100644
--- a/support-lib/composer/DataRef_composer.cpp
+++ b/support-lib/composer/DataRef_composer.cpp
@@ -14,7 +14,6 @@
   * limitations under the License.
   */
 
-#include "../cpp/DataRef.hpp"
 #include "DataRef_composer.hpp"
 #include <variant>
 
diff --git a/support-lib/composer/DataRef_composer.hpp b/support-lib/composer/DataRef_composer.hpp
index 2abf0509..554c92a1 100644
--- a/support-lib/composer/DataRef_composer.hpp
+++ b/support-lib/composer/DataRef_composer.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_composer.hpp"
-#include "../cpp/DataRef.hpp"
+#include "DataRef.hpp"
 
 namespace djinni::composer {
 
diff --git a/support-lib/composer/DataView_composer.hpp b/support-lib/composer/DataView_composer.hpp
index 3b7a85fa..2be749e8 100644
--- a/support-lib/composer/DataView_composer.hpp
+++ b/support-lib/composer/DataView_composer.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_composer.hpp"
-#include "../cpp/DataView.hpp"
+#include "DataView.hpp"
 
 namespace djinni::composer {
 
diff --git a/support-lib/composer/Future_composer.hpp b/support-lib/composer/Future_composer.hpp
index 27b35e84..113b1978 100644
--- a/support-lib/composer/Future_composer.hpp
+++ b/support-lib/composer/Future_composer.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_composer.hpp"
-#include "../cpp/Future.hpp"
+#include "Future.hpp"
 #include "composer_core/cpp/Utils/ResolvablePromise.hpp"
 
 namespace djinni {
diff --git a/support-lib/composer/Outcome_composer.hpp b/support-lib/composer/Outcome_composer.hpp
index 5cde75d3..422a2747 100644
--- a/support-lib/composer/Outcome_composer.hpp
+++ b/support-lib/composer/Outcome_composer.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_composer.hpp"
-#include "../cpp/expected.hpp"
+#include "expected.hpp"
 
 namespace djinni {
 
diff --git a/support-lib/jni/DataRef_jni.cpp b/support-lib/jni/DataRef_jni.cpp
index 137a250d..c983915c 100644
--- a/support-lib/jni/DataRef_jni.cpp
+++ b/support-lib/jni/DataRef_jni.cpp
@@ -14,7 +14,6 @@
   * limitations under the License.
   */
 
-#include "../cpp/DataRef.hpp"
 #include "DataRef_jni.hpp"
 
 #if DATAREF_JNI
diff --git a/support-lib/jni/DataRef_jni.hpp b/support-lib/jni/DataRef_jni.hpp
index c0708854..532bca52 100644
--- a/support-lib/jni/DataRef_jni.hpp
+++ b/support-lib/jni/DataRef_jni.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_support.hpp"
-#include "../cpp/DataRef.hpp"
+#include "DataRef.hpp"
 
 namespace djinni {
 struct NativeDataRef {
diff --git a/support-lib/jni/DataView_jni.hpp b/support-lib/jni/DataView_jni.hpp
index 482f0640..7fe2c4c3 100644
--- a/support-lib/jni/DataView_jni.hpp
+++ b/support-lib/jni/DataView_jni.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_support.hpp"
-#include "../cpp/DataView.hpp"
+#include "DataView.hpp"
 
 namespace djinni {
 
diff --git a/support-lib/jni/Future_jni.hpp b/support-lib/jni/Future_jni.hpp
index 592493bc..5d0a5e9b 100644
--- a/support-lib/jni/Future_jni.hpp
+++ b/support-lib/jni/Future_jni.hpp
@@ -18,7 +18,7 @@
 
 #include "djinni_support.hpp"
 #include "Marshal.hpp"
-#include "../cpp/Future.hpp"
+#include "Future.hpp"
 
 namespace djinni {
 
diff --git a/support-lib/jni/Outcome_jni.hpp b/support-lib/jni/Outcome_jni.hpp
index a7efab94..caddda74 100644
--- a/support-lib/jni/Outcome_jni.hpp
+++ b/support-lib/jni/Outcome_jni.hpp
@@ -18,7 +18,7 @@
 
 #include "djinni_support.hpp"
 #include "Marshal.hpp"
-#include "../cpp/expected.hpp"
+#include "expected.hpp"
 
 namespace djinni {
 
diff --git a/support-lib/objc/DataRef_objc.cpp b/support-lib/objc/DataRef_objc.cpp
index 8e1a3b98..0c4623b6 100644
--- a/support-lib/objc/DataRef_objc.cpp
+++ b/support-lib/objc/DataRef_objc.cpp
@@ -14,7 +14,6 @@
   * limitations under the License.
   */
 
-#include "../cpp/DataRef.hpp"
 #include "DataRef_objc.hpp"
 
 #if DATAREF_OBJC
diff --git a/support-lib/objc/DataRef_objc.hpp b/support-lib/objc/DataRef_objc.hpp
index 9e61d87f..47eb8b1f 100644
--- a/support-lib/objc/DataRef_objc.hpp
+++ b/support-lib/objc/DataRef_objc.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "DJIMarshal+Private.h"
-#include "../cpp/DataRef.hpp"
+#include "DataRef.hpp"
 
 namespace djinni {
 struct NativeDataRef {
diff --git a/support-lib/objc/DataView_objc.hpp b/support-lib/objc/DataView_objc.hpp
index c98ec85d..fefa47fc 100644
--- a/support-lib/objc/DataView_objc.hpp
+++ b/support-lib/objc/DataView_objc.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "DJIMarshal+Private.h"
-#include "../cpp/DataView.hpp"
+#include "DataView.hpp"
 
 namespace djinni {
 
diff --git a/support-lib/objc/Outcome_objc.hpp b/support-lib/objc/Outcome_objc.hpp
index 7f22f3c6..0fba9262 100644
--- a/support-lib/objc/Outcome_objc.hpp
+++ b/support-lib/objc/Outcome_objc.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "DJIMarshal+Private.h"
-#include "../cpp/expected.hpp"
+#include "expected.hpp"
 #import "DJOutcome.h"
 
 namespace djinni {
diff --git a/support-lib/wasm/DataRef_wasm.cpp b/support-lib/wasm/DataRef_wasm.cpp
index d8abaf6b..a03e7fa4 100644
--- a/support-lib/wasm/DataRef_wasm.cpp
+++ b/support-lib/wasm/DataRef_wasm.cpp
@@ -14,7 +14,6 @@
   * limitations under the License.
   */
 
-#include "../cpp/DataRef.hpp"
 #include "DataRef_wasm.hpp"
 
 #if DATAREF_WASM
diff --git a/support-lib/wasm/DataRef_wasm.hpp b/support-lib/wasm/DataRef_wasm.hpp
index 6adae898..6cb6e075 100644
--- a/support-lib/wasm/DataRef_wasm.hpp
+++ b/support-lib/wasm/DataRef_wasm.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_wasm.hpp"
-#include "../cpp/DataRef.hpp"
+#include "DataRef.hpp"
 
 namespace djinni {
 
diff --git a/support-lib/wasm/DataView_wasm.hpp b/support-lib/wasm/DataView_wasm.hpp
index 25738233..07015324 100644
--- a/support-lib/wasm/DataView_wasm.hpp
+++ b/support-lib/wasm/DataView_wasm.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_wasm.hpp"
-#include "../cpp/DataView.hpp"
+#include "DataView.hpp"
 
 namespace djinni {
 
diff --git a/support-lib/wasm/Future_wasm.hpp b/support-lib/wasm/Future_wasm.hpp
index ac501289..6c8529e3 100644
--- a/support-lib/wasm/Future_wasm.hpp
+++ b/support-lib/wasm/Future_wasm.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_wasm.hpp"
-#include "../cpp/Future.hpp"
+#include "Future.hpp"
 
 namespace djinni {
 
diff --git a/support-lib/wasm/Outcome_wasm.hpp b/support-lib/wasm/Outcome_wasm.hpp
index 949e861d..3271a746 100644
--- a/support-lib/wasm/Outcome_wasm.hpp
+++ b/support-lib/wasm/Outcome_wasm.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "djinni_wasm.hpp"
-#include "../cpp/expected.hpp"
+#include "expected.hpp"
 
 namespace djinni {