From 1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Thu, 16 Jun 2022 02:00:29 +0200
Subject: [PATCH] Common: Fix variable shadowing.

---
 src/common/address_space.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/address_space.inc b/src/common/address_space.inc
index 907c55d88e..e1241d0992 100644
--- a/src/common/address_space.inc
+++ b/src/common/address_space.inc
@@ -30,9 +30,9 @@
         FlatAllocator<VaType, UnmappedVa, AddressSpaceBits>
 
 namespace Common {
-MAP_MEMBER_CONST()::FlatAddressSpaceMap(VaType vaLimit,
-                                        std::function<void(VaType, VaType)> unmapCallback)
-    : unmapCallback(std::move(unmapCallback)), vaLimit(vaLimit) {
+MAP_MEMBER_CONST()::FlatAddressSpaceMap(VaType vaLimit_,
+                                        std::function<void(VaType, VaType)> unmapCallback_)
+    : unmapCallback(std::move(unmapCallback_)), vaLimit(vaLimit_) {
     if (vaLimit > VaMaximum)
         UNREACHABLE_MSG("Invalid VA limit!");
 }
@@ -261,8 +261,8 @@ MAP_MEMBER(void)::UnmapLocked(VaType virt, VaType size) {
         unmapCallback(virt, size);
 }
 
-ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart, VaType vaLimit)
-    : Base(vaLimit), currentLinearAllocEnd(vaStart), vaStart(vaStart) {}
+ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart_, VaType vaLimit)
+    : Base(vaLimit), currentLinearAllocEnd(vaStart_), vaStart(vaStart_) {}
 
 ALLOC_MEMBER(VaType)::Allocate(VaType size) {
     std::scoped_lock lock(this->blockMutex);