Merge pull request protocolbuffers#9739 from smertnik3sh/add-getobjec…

…t-def-undef Escape GetObject macro inside protoc-generated code
quchwe · Apr 5, 2022 · 6d068f8 · 6d068f8
2 parents 1e60bd6 + e1d39a7
commit 6d068f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -779,6 +779,8 @@
 #undef GetClassName
 #pragma push_macro("GetMessage")
 #undef GetMessage
+#pragma push_macro("GetObject")
+#undef GetObject
 #pragma push_macro("IGNORE")
 #undef IGNORE
 #pragma push_macro("IN")

diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc
@@ -114,6 +114,7 @@
 #pragma pop_macro("ERROR_NOT_FOUND")
 #pragma pop_macro("GetClassName")
 #pragma pop_macro("GetMessage")
+#pragma pop_macro("GetObject")
 #pragma pop_macro("IGNORE")
 #pragma pop_macro("IN")
 #pragma pop_macro("INPUT_KEYBOARD")