A32/location_descriptor: Disambiguate identifiers
Otherwise produces an -fpermissive error
This commit is contained in:
parent
83b55fe59b
commit
7d11170aaf
1 changed files with 2 additions and 2 deletions
|
@ -43,8 +43,8 @@ public:
|
|||
bool TFlag() const { return cpsr.T(); }
|
||||
bool EFlag() const { return cpsr.E(); }
|
||||
|
||||
PSR CPSR() const { return cpsr; }
|
||||
FPSCR FPSCR() const { return fpscr; }
|
||||
A32::PSR CPSR() const { return cpsr; }
|
||||
A32::FPSCR FPSCR() const { return fpscr; }
|
||||
|
||||
bool operator == (const LocationDescriptor& o) const {
|
||||
return std::tie(arm_pc, cpsr, fpscr) == std::tie(o.arm_pc, o.cpsr, o.fpscr);
|
||||
|
|
Loading…
Reference in a new issue