diff options
| author |  Morph | 2022-06-29 20:36:39 -0400 |
|---|---|---|
| committer |  Fernando Sahmkow | 2022-10-06 21:00:54 +0200 |
| commit | 11e1cbbdbde8269e7cdb0e150f25639223bdd3e6 (patch) | |
| tree | c3e1c99cb4502c2c5f02af7eb601de6a358d7177 /src/common/address_space.inc | |
| parent | address_space: Address feedback (diff) | |
| download | yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar.gz yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.tar.xz yuzu-11e1cbbdbde8269e7cdb0e150f25639223bdd3e6.zip | |
address_space: Rename va_start to virt_start
Avoids conflicting with the va_start macro
Diffstat (limited to 'src/common/address_space.inc')
| -rw-r--r-- | src/common/address_space.inc | 4 |
1 files changed, 2 insertions, 2 deletions
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) { | |||
| 284 | unmap_callback(virt, size); | 284 | unmap_callback(virt, size); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | ALLOC_MEMBER_CONST()::FlatAllocator(VaType va_start_, VaType va_limit_) | 287 | ALLOC_MEMBER_CONST()::FlatAllocator(VaType virt_start_, VaType va_limit_) |
| 288 | : Base{va_limit_}, va_start{va_start_}, current_linear_alloc_end{va_start_} {} | 288 | : Base{va_limit_}, virt_start{virt_start_}, current_linear_alloc_end{virt_start_} {} |
| 289 | 289 | ||
| 290 | ALLOC_MEMBER(VaType)::Allocate(VaType size) { | 290 | ALLOC_MEMBER(VaType)::Allocate(VaType size) { |
| 291 | std::scoped_lock lock(this->block_mutex); | 291 | std::scoped_lock lock(this->block_mutex); |