From 44315541c3b56ecbfd4cfcc3bec674441e905293 Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Sun, 30 Jul 2023 18:44:49 +0000
Subject: [PATCH] fix AsFlags rename conflict
---
src/Ryujinx.Cpu/AddressSpace.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Ryujinx.Cpu/AddressSpace.cs b/src/Ryujinx.Cpu/AddressSpace.cs
index 4e1820f01..bc0c5648b 100644
--- a/src/Ryujinx.Cpu/AddressSpace.cs
+++ b/src/Ryujinx.Cpu/AddressSpace.cs
@@ -186,8 +186,8 @@ namespace Ryujinx.Cpu
try
{
- baseMemory = new MemoryBlock(asSize, asFlags);
- mirrorMemory = new MemoryBlock(asSize, asFlags);
+ baseMemory = new MemoryBlock(asSize, AsFlags);
+ mirrorMemory = new MemoryBlock(asSize, AsFlags);
addressSpace = new AddressSpace(backingMemory, baseMemory, mirrorMemory, asSize, supports4KBPages);
}
catch (SystemException)
@@ -203,7 +203,7 @@ namespace Ryujinx.Cpu
{
addressSpace = null;
- MemoryAllocationFlags asFlags = MemoryAllocationFlags.Reserve | MemoryAllocationFlags.ViewCompatible;
+ MemoryAllocationFlags AsFlags = MemoryAllocationFlags.Reserve | MemoryAllocationFlags.ViewCompatible;
ulong minAddressSpaceSize = Math.Min(asSize, 1UL << 36);