From cdcc55a6a8fe9b4625b316a8d8845366ccfa71c9 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 22 Apr 2019 19:45:10 -0700 Subject: mem: Minimize the use of MemObject. MemObject doesn't provide anything beyond its base ClockedObject any more, so this change removes it from most inheritance hierarchies. Occasionally MemObject is replaced with SimObject when I was fairly confident that the extra functionality of ClockedObject wasn't needed. Change-Id: Ic014ab61e56402e62548e8c831eb16e26523fdce Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18289 Tested-by: kokoro Reviewed-by: Anthony Gutierrez Maintainer: Gabe Black --- src/mem/mem_delay.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mem/mem_delay.hh') diff --git a/src/mem/mem_delay.hh b/src/mem/mem_delay.hh index 789d965c8..894ddc02d 100644 --- a/src/mem/mem_delay.hh +++ b/src/mem/mem_delay.hh @@ -40,8 +40,8 @@ #ifndef __MEM_MEM_DELAY_HH__ #define __MEM_MEM_DELAY_HH__ -#include "mem/mem_object.hh" #include "mem/qport.hh" +#include "sim/clocked_object.hh" struct MemDelayParams; struct SimpleMemDelayParams; @@ -61,7 +61,7 @@ struct SimpleMemDelayParams; * * NOTE: Packets may be reordered if the delays aren't constant. */ -class MemDelay : public MemObject +class MemDelay : public ClockedObject { public: -- cgit v1.2.3