1--- third_party/googletest/googletest/include/gtest/gtest-message.h
2+++ third_party/googletest/googletest/include/gtest/gtest-message.h
3@@ -51,7 +51,11 @@
4 #include <limits>
5 #include <memory>
6 #include <ostream>
7+#undef private
8+#define private private
9 #include <sstream>
10+#undef private
11+#define private public
12 #include <string>
13 
14 #include "gtest/internal/gtest-port.h"
15--- third_party/googletest/googletest/include/gtest/gtest.h
16+++ third_party/googletest/googletest/include/gtest/gtest.h
17@@ -56,12 +56,20 @@
18 
19 #include <cstddef>
20 #include <cstdint>
21+#undef private
22+#define private private
23 #include <iomanip>
24+#undef private
25+#define private public
26 #include <limits>
27 #include <memory>
28 #include <ostream>
29 #include <set>
30+#undef private
31+#define private private
32 #include <sstream>
33+#undef private
34+#define private public
35 #include <string>
36 #include <type_traits>
37 #include <vector>
38--- third_party/googletest/googletest/include/gtest/internal/gtest-internal.h
39+++ third_party/googletest/googletest/include/gtest/internal/gtest-internal.h
40@@ -58,7 +58,11 @@
41 
42 #include <cstdint>
43 #include <functional>
44+#undef private
45+#define private private
46 #include <iomanip>
47+#undef private
48+#define private public
49 #include <limits>
50 #include <map>
51 #include <set>
52--- third_party/googletest/googletest/include/gtest/internal/gtest-port.h
53+++ third_party/googletest/googletest/include/gtest/internal/gtest-port.h
54@@ -2356,7 +2356,11 @@ using Any = ::absl::any;
55 // Otherwise for C++17 and higher use std::any for UniversalPrinter<>
56 // specializations.
57 #define GTEST_INTERNAL_HAS_ANY 1
58+#undef private
59+#define private private
60 #include <any>
61+#undef private
62+#define private public
63 namespace testing {
64 namespace internal {
65 using Any = ::std::any;
66--- third_party/googletest/googletest/include/gtest/internal/gtest-string.h
67+++ third_party/googletest/googletest/include/gtest/internal/gtest-string.h
68@@ -51,7 +51,11 @@
69 #include <string.h>
70 
71 #include <cstdint>
72+#undef private
73+#define private private
74 #include <sstream>
75+#undef private
76+#define private public
77 #include <string>
78 
79 #include "gtest/internal/gtest-port.h"
80