From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 19 Oct 2018 23:51:15 +0000 (+0100)
Subject: stop using auto in mmu.h macro, use type##_t
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c726aea3ebaf2fe52d3440a0628e899f660c45b8;p=riscv-isa-sim.git

stop using auto in mmu.h macro, use type##_t
---

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 */ \