franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Common: Fix variable shadowing.

This commit is contained in:
Fernando Sahmkow 2022-06-16 02:00:29 +02:00
parent cdce7f781b
commit 1a9b71b1c6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/address_space.inc
View File

@ -30,9 +30,9 @@
FlatAllocator<VaType, UnmappedVa, AddressSpaceBits> FlatAllocator<VaType, UnmappedVa, AddressSpaceBits>
namespace Common { namespace Common {
MAP_MEMBER_CONST()::FlatAddressSpaceMap(VaType vaLimit, MAP_MEMBER_CONST()::FlatAddressSpaceMap(VaType vaLimit_,
std::function<void(VaType, VaType)> unmapCallback) std::function<void(VaType, VaType)> unmapCallback_)
: unmapCallback(std::move(unmapCallback)), vaLimit(vaLimit) { : unmapCallback(std::move(unmapCallback_)), vaLimit(vaLimit_) {
if (vaLimit > VaMaximum) if (vaLimit > VaMaximum)
UNREACHABLE_MSG("Invalid VA limit!"); UNREACHABLE_MSG("Invalid VA limit!");
} }
@ -261,8 +261,8 @@ MAP_MEMBER(void)::UnmapLocked(VaType virt, VaType size) {
unmapCallback(virt, size); unmapCallback(virt, size);
} }
ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart, VaType vaLimit) ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart_, VaType vaLimit)
: Base(vaLimit), currentLinearAllocEnd(vaStart), vaStart(vaStart) {} : Base(vaLimit), currentLinearAllocEnd(vaStart_), vaStart(vaStart_) {}
ALLOC_MEMBER(VaType)::Allocate(VaType size) { ALLOC_MEMBER(VaType)::Allocate(VaType size) {
std::scoped_lock lock(this->blockMutex); std::scoped_lock lock(this->blockMutex);