Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI breakage from recent merge #12504

Merged
merged 1 commit into from
Mar 9, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/external/abseil-cpp.patch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ index d886cb30..c2a2d15e 100644
@@ -35,6 +35,12 @@
#ifndef ABSL_META_TYPE_TRAITS_H_
#define ABSL_META_TYPE_TRAITS_H_

+// Added by firebase-ios-sdk/cmake/external/abseil-cpp.patch.txt
+#if __clang__
+#pragma clang diagnostic push
Expand All @@ -18,7 +18,7 @@ index d886cb30..c2a2d15e 100644
@@ -794,4 +800,9 @@ using swap_internal::StdSwapIsUnconstrained;
ABSL_NAMESPACE_END
} // namespace absl

+// Added by firebase-ios-sdk/cmake/external/abseil-cpp.patch.txt
+#if __clang__
+#pragma clang diagnostic pop
Expand Down
Loading