mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A32/location_descriptor: Disambiguate identifiers

Browse source 
Otherwise produces an -fpermissive error
This commit is contained in:
MerryMage 2018-01-10 18:40:31 +00:00
parent 83b55fe59b
commit 7d11170aaf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/frontend/A32/location_descriptor.h
View file

@ -43,8 +43,8 @@ public:
bool TFlag() const { return cpsr.T(); } bool TFlag() const { return cpsr.T(); }
bool EFlag() const { return cpsr.E(); } bool EFlag() const { return cpsr.E(); }
PSR CPSR() const { return cpsr; } A32::PSR CPSR() const { return cpsr; }
FPSCR FPSCR() const { return fpscr; } A32::FPSCR FPSCR() const { return fpscr; }
bool operator == (const LocationDescriptor& o) const { bool operator == (const LocationDescriptor& o) const {
return std::tie(arm_pc, cpsr, fpscr) == std::tie(o.arm_pc, o.cpsr, o.fpscr); return std::tie(arm_pc, cpsr, fpscr) == std::tie(o.arm_pc, o.cpsr, o.fpscr);