Skip to content

Commit a8b4305

Browse files
committed
Fix interop conflicts
1 parent dd51f40 commit a8b4305

File tree

1 file changed

+6
-67
lines changed

1 file changed

+6
-67
lines changed

src/Temporalio/Bridge/Interop/Interop.cs

Lines changed: 6 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -279,67 +279,6 @@ internal unsafe partial struct TemporalCoreRpcCallOptions
279279
public TemporalCoreCancellationToken* cancellation_token;
280280
}
281281

282-
[StructLayout(LayoutKind.Sequential)]
283-
internal unsafe partial struct TemporalCoreClientEnvConfigOrFail
284-
{
285-
[NativeTypeName("const struct TemporalCoreByteArray *")]
286-
public TemporalCoreByteArray* success;
287-
288-
[NativeTypeName("const struct TemporalCoreByteArray *")]
289-
public TemporalCoreByteArray* fail;
290-
}
291-
292-
[StructLayout(LayoutKind.Sequential)]
293-
internal unsafe partial struct TemporalCoreClientEnvConfigLoadOptions
294-
{
295-
[NativeTypeName("const char *")]
296-
public TemporalCoreByteArrayRef path;
297-
298-
[NativeTypeName("struct TemporalCoreByteArrayRef")]
299-
public TemporalCoreByteArrayRef data;
300-
301-
[NativeTypeName("bool")]
302-
public byte config_file_strict;
303-
304-
[NativeTypeName("struct TemporalCoreByteArrayRef")]
305-
public TemporalCoreByteArrayRef env_vars;
306-
}
307-
308-
[StructLayout(LayoutKind.Sequential)]
309-
internal unsafe partial struct TemporalCoreClientEnvConfigProfileOrFail
310-
{
311-
[NativeTypeName("const struct TemporalCoreByteArray *")]
312-
public TemporalCoreByteArray* success;
313-
314-
[NativeTypeName("const struct TemporalCoreByteArray *")]
315-
public TemporalCoreByteArray* fail;
316-
}
317-
318-
[StructLayout(LayoutKind.Sequential)]
319-
internal unsafe partial struct TemporalCoreClientEnvConfigProfileLoadOptions
320-
{
321-
[NativeTypeName("const char *")]
322-
public TemporalCoreByteArrayRef profile;
323-
324-
[NativeTypeName("const char *")]
325-
public TemporalCoreByteArrayRef path;
326-
327-
[NativeTypeName("struct TemporalCoreByteArrayRef")]
328-
public TemporalCoreByteArrayRef data;
329-
330-
[NativeTypeName("bool")]
331-
public byte disable_file;
332-
333-
[NativeTypeName("bool")]
334-
public byte disable_env;
335-
336-
[NativeTypeName("bool")]
337-
public byte config_file_strict;
338-
339-
[NativeTypeName("struct TemporalCoreByteArrayRef")]
340-
public TemporalCoreByteArrayRef env_vars;
341-
}
342-
343282
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
344283
internal unsafe delegate void TemporalCoreClientRpcCallCallback(void* user_data, [NativeTypeName("const struct TemporalCoreByteArray *")] TemporalCoreByteArray* success, [NativeTypeName("uint32_t")] uint status_code, [NativeTypeName("const struct TemporalCoreByteArray *")] TemporalCoreByteArray* failure_message, [NativeTypeName("const struct TemporalCoreByteArray *")] TemporalCoreByteArray* failure_details);
345284

@@ -794,15 +733,15 @@ internal unsafe partial struct _Anonymous_e__Union
794733
{
795734
[FieldOffset(0)]
796735
[NativeTypeName("__AnonymousRecord_temporal-sdk-core-c-bridge_L432_C5")]
797-
public _Anonymous1_1_e__Struct Anonymous1_1;
736+
public _Anonymous1_e__Struct Anonymous1;
798737

799738
[FieldOffset(0)]
800739
[NativeTypeName("__AnonymousRecord_temporal-sdk-core-c-bridge_L435_C5")]
801-
public _Anonymous2_1_e__Struct Anonymous2_1;
740+
public _Anonymous2_e__Struct Anonymous2;
802741

803742
[FieldOffset(0)]
804743
[NativeTypeName("__AnonymousRecord_temporal-sdk-core-c-bridge_L438_C5")]
805-
public _Anonymous3_1_e__Struct Anonymous3_1;
744+
public _Anonymous3_e__Struct Anonymous3;
806745

807746
internal partial struct _Anonymous1_e__Struct
808747
{
@@ -1098,15 +1037,15 @@ internal unsafe partial struct _Anonymous_e__Union
10981037
{
10991038
[FieldOffset(0)]
11001039
[NativeTypeName("__AnonymousRecord_temporal-sdk-core-c-bridge_L558_C5")]
1101-
public _Anonymous1_1_e__Struct Anonymous1_1;
1040+
public _Anonymous1_e__Struct Anonymous1;
11021041

11031042
[FieldOffset(0)]
11041043
[NativeTypeName("__AnonymousRecord_temporal-sdk-core-c-bridge_L561_C5")]
1105-
public _Anonymous2_1_e__Struct Anonymous2_1;
1044+
public _Anonymous2_e__Struct Anonymous2;
11061045

11071046
[FieldOffset(0)]
11081047
[NativeTypeName("__AnonymousRecord_temporal-sdk-core-c-bridge_L564_C5")]
1109-
public _Anonymous3_1_e__Struct Anonymous3_1;
1048+
public _Anonymous3_e__Struct Anonymous3;
11101049

11111050
internal partial struct _Anonymous1_e__Struct
11121051
{

0 commit comments

Comments
 (0)