From 8fa377f6bd295e10ba95261a64fc567773ff0bbf Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Tue, 18 Jun 2019 00:30:54 -0500 Subject: [PATCH] Disable naming warnings on files with external enum names --- Ryujinx.Graphics/Gal/GalImageFormat.cs | 3 ++- Ryujinx.Graphics/Shader/Decoders/OpCodeTextureScalar.cs | 1 + Ryujinx.HLE/HOS/Services/Vi/ColorFormat.cs | 3 ++- Ryujinx.Tests.Unicorn/Native/ArmRegister.cs | 1 + Ryujinx.Tests.Unicorn/Native/UnicornMode.cs | 1 + Ryujinx.Tests.Unicorn/UnicornError.cs | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Ryujinx.Graphics/Gal/GalImageFormat.cs b/Ryujinx.Graphics/Gal/GalImageFormat.cs index 8dcde18201..19ce6cfc49 100644 --- a/Ryujinx.Graphics/Gal/GalImageFormat.cs +++ b/Ryujinx.Graphics/Gal/GalImageFormat.cs @@ -1,4 +1,5 @@ -using System; +// ReSharper disable InconsistentNaming +using System; namespace Ryujinx.Graphics.Gal { diff --git a/Ryujinx.Graphics/Shader/Decoders/OpCodeTextureScalar.cs b/Ryujinx.Graphics/Shader/Decoders/OpCodeTextureScalar.cs index 4389f45319..470b81f5c0 100644 --- a/Ryujinx.Graphics/Shader/Decoders/OpCodeTextureScalar.cs +++ b/Ryujinx.Graphics/Shader/Decoders/OpCodeTextureScalar.cs @@ -1,3 +1,4 @@ +// ReSharper disable InconsistentNaming using Ryujinx.Graphics.Shader.Instructions; namespace Ryujinx.Graphics.Shader.Decoders diff --git a/Ryujinx.HLE/HOS/Services/Vi/ColorFormat.cs b/Ryujinx.HLE/HOS/Services/Vi/ColorFormat.cs index 67848b4347..7093858557 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/ColorFormat.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/ColorFormat.cs @@ -1,4 +1,5 @@ -namespace Ryujinx.HLE.HOS.Services.Android +// ReSharper disable InconsistentNaming +namespace Ryujinx.HLE.HOS.Services.Android { class ColorShift { diff --git a/Ryujinx.Tests.Unicorn/Native/ArmRegister.cs b/Ryujinx.Tests.Unicorn/Native/ArmRegister.cs index cf110598eb..e0422d8e6f 100644 --- a/Ryujinx.Tests.Unicorn/Native/ArmRegister.cs +++ b/Ryujinx.Tests.Unicorn/Native/ArmRegister.cs @@ -1,3 +1,4 @@ +// ReSharper disable InconsistentNaming namespace Ryujinx.Tests.Unicorn.Native { public enum ArmRegister diff --git a/Ryujinx.Tests.Unicorn/Native/UnicornMode.cs b/Ryujinx.Tests.Unicorn/Native/UnicornMode.cs index a5040518dd..5cd835169b 100644 --- a/Ryujinx.Tests.Unicorn/Native/UnicornMode.cs +++ b/Ryujinx.Tests.Unicorn/Native/UnicornMode.cs @@ -1,3 +1,4 @@ +// ReSharper disable InconsistentNaming namespace Ryujinx.Tests.Unicorn.Native { public enum UnicornMode diff --git a/Ryujinx.Tests.Unicorn/UnicornError.cs b/Ryujinx.Tests.Unicorn/UnicornError.cs index 7c8e2fdf83..ac324089c1 100644 --- a/Ryujinx.Tests.Unicorn/UnicornError.cs +++ b/Ryujinx.Tests.Unicorn/UnicornError.cs @@ -1,3 +1,4 @@ +// ReSharper disable InconsistentNaming namespace Ryujinx.Tests.Unicorn { public enum UnicornError