summaryrefslogtreecommitdiff
path: root/inc/cache.h
diff options
context:
space:
mode:
authorbd <bdunahu@operationnull.com>2025-03-09 16:26:36 -0400
committerbd <bdunahu@operationnull.com>2025-03-09 16:26:36 -0400
commit56c92e4785fa6952e390fd249cd654f0e5b2d83e (patch)
treeda8084ff1dc6bb360acc31a2a7d2be212f71a263 /inc/cache.h
parent75417c54b52df5b98601e3a22b47de1641eab914 (diff)
finish merge conflict
Diffstat (limited to 'inc/cache.h')
-rw-r--r--inc/cache.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/cache.h b/inc/cache.h
index d9d8ba7..4e4b48d 100644
--- a/inc/cache.h
+++ b/inc/cache.h
@@ -21,7 +21,10 @@ class Cache : public Storage
~Cache();
Response write(Accessor accessor, signed int data, int address) override;
- Response read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) override;
+ Response read(
+ Accessor accessor,
+ int address,
+ std::array<signed int, LINE_SIZE> &data) override;
private:
/**