tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I072883b3aa38d9d2b0557dfa2effc415c97d48cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-06-10 21:01:09 +00:00 committed by Automerger Merge Worker
commit af9c5273e5
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/complex_test.cpp
View file

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