X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FMerger.java;h=34ba217cf7a551806c2a4e732e15db9518357542;hb=5606ceefa2c360772194c85ed884e5f8f06f36aa;hp=613d52391450dca92675bec68b4b7079671ef87e;hpb=b1e7855af2dfc15b4d6c1253dd77db02925162f3;p=Mograsim.git diff --git a/era.mi/src/era/mi/logic/components/Merger.java b/era.mi/src/era/mi/logic/components/Merger.java index 613d5239..34ba217c 100644 --- a/era.mi/src/era/mi/logic/components/Merger.java +++ b/era.mi/src/era/mi/logic/components/Merger.java @@ -2,7 +2,7 @@ package era.mi.logic.components; import java.util.List; -import era.mi.logic.Bit; +import era.mi.logic.types.BitVector; import era.mi.logic.wires.Wire; import era.mi.logic.wires.Wire.WireEnd; import era.mi.logic.wires.WireObserver; @@ -48,7 +48,7 @@ public class Merger implements WireObserver, Component } @Override - public void update(Wire initiator, Bit[] oldValues) + public void update(Wire initiator, BitVector oldValues) { int index = find(initiator); int beginning = beginningIndex[index];