Skip to content

Commit 1d192f9

Browse files
committed
Merge remote-tracking branch 'upstream/main' into interlockedgeneric
2 parents 58e341d + 17bcc24 commit 1d192f9

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ namespace System
2121
[DebuggerTypeProxy(typeof(SpanDebugView<>))]
2222
[DebuggerDisplay("{ToString(),raw}")]
2323
[NonVersionable]
24-
#pragma warning disable SYSLIB1056 // Specified native type is invalid
2524
[NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
26-
#pragma warning restore SYSLIB1056 // Specified native type is invalid
2725
[Intrinsic]
2826
public readonly ref struct ReadOnlySpan<T>
2927
{

src/libraries/System.Private.CoreLib/src/System/Span.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ namespace System
2020
[DebuggerTypeProxy(typeof(SpanDebugView<>))]
2121
[DebuggerDisplay("{ToString(),raw}")]
2222
[NonVersionable]
23-
#pragma warning disable SYSLIB1056 // Specified native type is invalid
2423
[NativeMarshalling(typeof(SpanMarshaller<,>))]
25-
#pragma warning restore SYSLIB1056 // Specified native type is invalid
2624
[Intrinsic]
2725
public readonly ref struct Span<T>
2826
{

0 commit comments

Comments
 (0)