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

---
 src/storage/dram.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/storage/dram.cc b/src/storage/dram.cc
index be360a4..76c4f90 100644
--- a/src/storage/dram.cc
+++ b/src/storage/dram.cc
@@ -94,7 +94,7 @@ Response Dram::write(Accessor accessor, signed int data, int address)
 	return r;
 }
 
-Response Dram::read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) { 
+Response Dram::read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data_line) { 
 	Response r = WAIT;
 
 	if (this->requester == IDLE)
@@ -102,7 +102,7 @@ Response Dram::read(Accessor accessor, int address, std::array<signed int, LINE_
 
 	if (this->requester == accessor) {
 		if (this->wait_time == 0) {
-			this->do_read(data, address);
+			this->do_read(data_line, address);
 			r = OK;
 		}
 	}
-- 
cgit v1.2.3