From e06f97b02b161f5356117d0ccc5a9ea9b11fe99e Mon Sep 17 00:00:00 2001 From: Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:45:50 -0400 Subject: Resolving conflicts --- inc/dram.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'inc/dram.h') diff --git a/inc/dram.h b/inc/dram.h index 427500c..7774040 100644 --- a/inc/dram.h +++ b/inc/dram.h @@ -21,10 +21,8 @@ class Dram : public Storage Response read( Accessor accessor, int address, - std::array &data) override; + std::array &data_line) override; Response write_line(Accessor accessor, std::array data_line, int address) override; - - Response read(Accessor accessor, int address, std::array& data) override; Response read_word(Accessor accessor, int address, signed int &data) override; private: @@ -40,7 +38,6 @@ class Dram : public Storage * Helper for `read` a line */ void do_read(std::array &data_line, int address); - void do_read(std::array& data_line, int address); /** * Helper for reading a word. */ -- cgit v1.2.3