From 11e1cbbdbde8269e7cdb0e150f25639223bdd3e6 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Wed, 29 Jun 2022 20:36:39 -0400
Subject: address_space: Rename va_start to virt_start

Avoids conflicting with the va_start macro
---
 src/common/address_space.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/common/address_space.inc')

diff --git a/src/common/address_space.inc b/src/common/address_space.inc
index 3661b298e..9f957c81d 100644
--- a/src/common/address_space.inc
+++ b/src/common/address_space.inc
@@ -284,8 +284,8 @@ MAP_MEMBER(void)::UnmapLocked(VaType virt, VaType size) {
         unmap_callback(virt, size);
 }
 
-ALLOC_MEMBER_CONST()::FlatAllocator(VaType va_start_, VaType va_limit_)
-    : Base{va_limit_}, va_start{va_start_}, current_linear_alloc_end{va_start_} {}
+ALLOC_MEMBER_CONST()::FlatAllocator(VaType virt_start_, VaType va_limit_)
+    : Base{va_limit_}, virt_start{virt_start_}, current_linear_alloc_end{virt_start_} {}
 
 ALLOC_MEMBER(VaType)::Allocate(VaType size) {
     std::scoped_lock lock(this->block_mutex);
-- 
cgit v1.2.3