diff options
| author | Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com> | 2025-03-11 11:45:50 -0400 |
|---|---|---|
| committer | Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com> | 2025-03-11 11:45:50 -0400 |
| commit | b87fa0973b7a3ec08b08e86a2505e68879455b0e (patch) | |
| tree | ca169a297c457abf3aad2edc1fbfcb3663ee1e26 /inc/cache.h | |
| parent | d7d24031e6df2529ba5c447da0393807be3e3e81 (diff) | |
Resolving conflicts
Diffstat (limited to 'inc/cache.h')
| -rw-r--r-- | inc/cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/cache.h b/inc/cache.h index bc37f54..20a40c2 100644 --- a/inc/cache.h +++ b/inc/cache.h @@ -25,7 +25,7 @@ class Cache : public Storage Response read( Accessor accessor, int address, - std::array<signed int, LINE_SIZE> &data) override; + std::array<signed int, LINE_SIZE> &data_line) override; Response read_word(Accessor accessor, int address, signed int &data) override; /** |