Merge pull request #9739 from smertnik3sh/add-getobject-def-undef

Escape GetObject macro inside protoc-generated code
pull/9745/head
Matt Fowles Kulukundis 3 years ago committed by GitHub
commit 6d068f8c6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/google/protobuf/port_def.inc
  2. 1
      src/google/protobuf/port_undef.inc

@ -779,6 +779,8 @@
#undef GetClassName #undef GetClassName
#pragma push_macro("GetMessage") #pragma push_macro("GetMessage")
#undef GetMessage #undef GetMessage
#pragma push_macro("GetObject")
#undef GetObject
#pragma push_macro("IGNORE") #pragma push_macro("IGNORE")
#undef IGNORE #undef IGNORE
#pragma push_macro("IN") #pragma push_macro("IN")

@ -114,6 +114,7 @@
#pragma pop_macro("ERROR_NOT_FOUND") #pragma pop_macro("ERROR_NOT_FOUND")
#pragma pop_macro("GetClassName") #pragma pop_macro("GetClassName")
#pragma pop_macro("GetMessage") #pragma pop_macro("GetMessage")
#pragma pop_macro("GetObject")
#pragma pop_macro("IGNORE") #pragma pop_macro("IGNORE")
#pragma pop_macro("IN") #pragma pop_macro("IN")
#pragma pop_macro("INPUT_KEYBOARD") #pragma pop_macro("INPUT_KEYBOARD")

Loading…
Cancel
Save