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>
This commit is contained in:
commit
ab3a64c20a
1 changed files with 4 additions and 0 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue