1--- third_party/googletest/googletest/include/gtest/internal/gtest-port.h 2023-01-17 16:10:56.252360383 +0800 2+++ /home/suze/tp/code/ohos_devtools_trace_resolver/third_party/googletest/googletest/include/gtest/internal/gtest-port.h 2023-01-06 17:58:25.834759489 +0800 3@@ -276,7 +276,6 @@ 4 # include <AvailabilityMacros.h> 5 # include <TargetConditionals.h> 6 #endif 7- 8 #include <iostream> // NOLINT 9 #include <locale> 10 #include <memory> 11@@ -2287,7 +2286,11 @@ using Any = ::absl::any; 12 // Otherwise for C++17 and higher use std::any for UniversalPrinter<> 13 // specializations. 14 #define GTEST_INTERNAL_HAS_ANY 1 15-#include <any> 16+#undef private 17+#define private private 18+#include <any> // NOLINT 19+#undef private 20+#define private public 21 namespace testing { 22 namespace internal { 23 using Any = ::std::any; 24