fix macroses conflict for windows (#6187)

2 files changed, 15 insertions, 15 deletions

diff --git a/ydb/core/protos/tx_columnshard.proto b/ydb/core/protos/tx_columnshard.proto
index 88214ab42b5..4cfd8c34cb0 100644
--- a/ydb/core/protos/tx_columnshard.proto
+++ b/ydb/core/protos/tx_columnshard.proto
@@ -72,11 +72,11 @@ message TEvWrite {
     optional uint32 WritePartId = 9 [default = 0];
     optional uint32 GranuleShardingVersion = 10;
     enum EModificationType {
-        UPSERT = 1;
-        INSERT = 2;
-        UPDATE = 3;
-        REPLACE = 4;
-        DELETE = 5;
+        OPERATION_UPSERT = 1;
+        OPERATION_INSERT = 2;
+        OPERATION_UPDATE = 3;
+        OPERATION_REPLACE = 4;
+        OPERATION_DELETE = 5;
     }
     optional EModificationType ModificationType = 11;
 
diff --git a/ydb/core/tx/data_events/common/modification_type.h b/ydb/core/tx/data_events/common/modification_type.h
index bed17f4a568..cf9f8d90e24 100644
--- a/ydb/core/tx/data_events/common/modification_type.h
+++ b/ydb/core/tx/data_events/common/modification_type.h
@@ -52,15 +52,15 @@ public:
     static TProto SerializeToProto(const NEvWrite::EModificationType value) {
         switch (value) {
             case NEvWrite::EModificationType::Upsert:
-                return NKikimrTxColumnShard::TEvWrite::UPSERT;
+                return NKikimrTxColumnShard::TEvWrite::OPERATION_UPSERT;
             case NEvWrite::EModificationType::Insert:
-                return NKikimrTxColumnShard::TEvWrite::INSERT;
+                return NKikimrTxColumnShard::TEvWrite::OPERATION_INSERT;
             case NEvWrite::EModificationType::Delete:
-                return NKikimrTxColumnShard::TEvWrite::DELETE;
+                return NKikimrTxColumnShard::TEvWrite::OPERATION_DELETE;
             case NEvWrite::EModificationType::Replace:
-                return NKikimrTxColumnShard::TEvWrite::REPLACE;
+                return NKikimrTxColumnShard::TEvWrite::OPERATION_REPLACE;
             case NEvWrite::EModificationType::Update:
-                return NKikimrTxColumnShard::TEvWrite::UPDATE;
+                return NKikimrTxColumnShard::TEvWrite::OPERATION_UPDATE;
         }
     }
 
@@ -83,15 +83,15 @@ public:
 
     static NEvWrite::EModificationType DeserializeFromProto(const NKikimrTxColumnShard::TEvWrite::EModificationType value) {
         switch (value) {
-            case NKikimrTxColumnShard::TEvWrite::UPSERT:
+            case NKikimrTxColumnShard::TEvWrite::OPERATION_UPSERT:
                 return NEvWrite::EModificationType::Upsert;
-            case NKikimrTxColumnShard::TEvWrite::INSERT:
+            case NKikimrTxColumnShard::TEvWrite::OPERATION_INSERT:
                 return NEvWrite::EModificationType::Insert;
-            case NKikimrTxColumnShard::TEvWrite::UPDATE:
+            case NKikimrTxColumnShard::TEvWrite::OPERATION_UPDATE:
                 return NEvWrite::EModificationType::Update;
-            case NKikimrTxColumnShard::TEvWrite::DELETE:
+            case NKikimrTxColumnShard::TEvWrite::OPERATION_DELETE:
                 return NEvWrite::EModificationType::Delete;
-            case NKikimrTxColumnShard::TEvWrite::REPLACE:
+            case NKikimrTxColumnShard::TEvWrite::OPERATION_REPLACE:
                 return NEvWrite::EModificationType::Replace;
         }
     }