X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FMerger.java;h=32321597de835b11d3e4be82cb9884f193a25b5c;hb=70afb26181aba8de30ea6f796ea5c2a573d9ecab;hp=860c010a6ef14c2847b28fabc6f6235c8bcdd2e2;hpb=7c7b279981f4686d4fe165cf327ff5b52d71c5f6;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 860c010a..32321597 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];