commit 93e57346851ade94605d2d1cb3bf90cdb935deda
author Daniel R. Carvalho <odanrc@yahoo.com.br> Sat May 08 07:59:47 2021 -0300
committer Daniel Carvalho <odanrc@yahoo.com.br> Sat May 29 11:13:49 2021 +0000
tree 364f3391bb603d37505c0a825868102e6c09e389
parent 98ac080ec46fc4f7abc0162b7c270fa785cb9fed

mem: Rename "memory" variables as "mem"

Pave the way to a "memory" namespace by renaming all
the variables that have a naming conflict.

Change-Id: I8327256ed88f1791225fe158f023132850303472
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45438
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/mem/cfi_mem.hh

diff --git a/src/mem/cfi_mem.hh b/src/mem/cfi_mem.hh
index f2c65d3..e49a154 100644
--- a/src/mem/cfi_mem.hh
+++ b/src/mem/cfi_mem.hh
@@ -232,7 +232,7 @@
     class MemoryPort : public ResponsePort
     {
       private:
-        CfiMemory& memory;
+        CfiMemory& mem;
 
       public:
         MemoryPort(const std::string& _name, CfiMemory& _memory);