Merge pull request #12821 from merryhime/atomic_ops

atomic_ops: Reduce code duplication with templates

1 files changed, 2 insertions, 4 deletions

diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 1c218566f..e10a4601e 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -781,8 +781,7 @@ struct Memory::Impl {
             },
             [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(T)); });
         if (ptr) {
-            const auto volatile_pointer = reinterpret_cast<volatile T*>(ptr);
-            return Common::AtomicCompareAndSwap(volatile_pointer, data, expected);
+            return Common::AtomicCompareAndSwap(reinterpret_cast<T*>(ptr), data, expected);
         }
         return true;
     }
@@ -796,8 +795,7 @@ struct Memory::Impl {
             },
             [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(u128)); });
         if (ptr) {
-            const auto volatile_pointer = reinterpret_cast<volatile u64*>(ptr);
-            return Common::AtomicCompareAndSwap(volatile_pointer, data, expected);
+            return Common::AtomicCompareAndSwap(reinterpret_cast<u64*>(ptr), data, expected);
         }
         return true;
     }