commit 2714bf0f5d3814188cfeacdb9eca0e4218618dd6
author Yuriy Chernyshov <thegeorg@yandex-team.ru> Fri Apr 16 00:30:39 2021 +0300
committer GitHub <noreply@github.com> Thu Apr 15 14:30:39 2021 -0700
tree 70edb8727be5548b6ebc8f033bd8a6621ec3df1a
parent 568fd626f907d3254d2f65f92982c072097533f8

Undef DELETE macro on Windows (#8497)

src/google/protobuf/port_def.inc

diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index bab41b3..4c29134 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -436,6 +436,8 @@
 #ifdef _MSC_VER
 #pragma push_macro("CREATE_NEW")
 #undef CREATE_NEW
+#pragma push_macro("DELETE")
+#undef DELETE
 #pragma push_macro("DOUBLE_CLICK")
 #undef DOUBLE_CLICK
 #pragma push_macro("ERROR")
@@ -479,7 +481,7 @@
 #endif  // _MSC_VER
 
 #if defined(__clang__) || defined(__GNUC__) || defined(_MSC_VER)
-// Don't let Objective-C Macros interfere with proto identifiers with the same 
+// Don't let Objective-C Macros interfere with proto identifiers with the same
 // name.
 #pragma push_macro("DEBUG")
 #undef DEBUG

src/google/protobuf/port_undef.inc

diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc
index 8591762..80bfd30 100644
--- a/src/google/protobuf/port_undef.inc
+++ b/src/google/protobuf/port_undef.inc
@@ -86,6 +86,7 @@
 // Restore macro that may have been #undef'd in port_def.inc.
 #ifdef _MSC_VER
 #pragma pop_macro("CREATE_NEW")
+#pragma pop_macro("DELETE")
 #pragma pop_macro("DOUBLE_CLICK")
 #pragma pop_macro("ERROR")
 #pragma pop_macro("ERROR_BUSY")