From c726aea3ebaf2fe52d3440a0628e899f660c45b8 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 20 Oct 2018 00:51:15 +0100
Subject: [PATCH] stop using auto in mmu.h macro, use type##_t

---
 riscv/mmu.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/riscv/mmu.h b/riscv/mmu.h
index 0bcfb3c..fc8d5b3 100644
--- a/riscv/mmu.h
+++ b/riscv/mmu.h
@@ -139,8 +139,8 @@ public:
       if (addr & (sizeof(type##_t)-1)) \
         throw trap_store_address_misaligned(addr); \
       try { \
-        auto lhs = load_##type(addr); \
-        store_##type(addr, f(lhs, rhs)); \
+        type##_t lhs = mmu_t::load_##type(addr); \
+        mmu_t::store_##type(addr, f(lhs, rhs)); \
         return lhs; \
       } catch (trap_load_page_fault& t) { \
         /* AMO faults should be reported as store faults */ \
-- 
2.30.2