commit ab3a64c20a335696ae2cd39b705feb62764a8e64
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jun 10 21:31:02 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 10 21:31:02 2024 +0000
tree e7ed2d83953b3eeb6e75bdfab3b05904a3e62e49
parent 192f4e6828be5afcec735ef1fdb4ecaec266edf0
parent af9c5273e5ddf1115df3d4a18529c0f264e5a7ac

Merge "Fix anonymous class error" into main am: 44b0e7a725 am: af9c5273e5

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3123411

Change-Id: Ie5754c593687f04493b655efc2296172886b0342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/complex_test.cpp

diff --git a/tests/complex_test.cpp b/tests/complex_test.cpp
index 6a1831f..8fdb2b2 100644
--- a/tests/complex_test.cpp
+++ b/tests/complex_test.cpp
@@ -32,7 +32,11 @@
 #include <math.h> // For M_PI_2/M_PI_2l.
 
 // Prettify gtest Complex printing.
+// Macro 'complex' defined in complex.h conflicts with iostream.
+#pragma push_macro("complex")
+#undef complex
 #include <iostream>
+#pragma pop_macro("complex")
 namespace testing {
 namespace internal {
 inline void PrintTo(const double _Complex& c, std::ostream* os) {