From 7d11170aaff274756f8657675177f80fb0f77e73 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Wed, 10 Jan 2018 18:40:31 +0000
Subject: [PATCH] A32/location_descriptor: Disambiguate identifiers

Otherwise produces an -fpermissive error
---
 src/frontend/A32/location_descriptor.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/A32/location_descriptor.h b/src/frontend/A32/location_descriptor.h
index 065d9ebd..19b6054d 100644
--- a/src/frontend/A32/location_descriptor.h
+++ b/src/frontend/A32/location_descriptor.h
@@ -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);