1--- third_party/googletest/googletest/include/gtest/internal/gtest-internal.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-internal.h 2023-01-06 17:58:25.830759482 +0800 3@@ -54,7 +54,11 @@ 4 #include <float.h> 5 #include <string.h> 6 #include <cstdint> 7+#undef private 8+#define private private 9 #include <iomanip> 10+#undef private 11+#define private public 12 #include <limits> 13 #include <map> 14 #include <set> 15