From 010d572e0a7a9659bf7fe817e1d18f56257b8da2 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 10 Apr 2017 21:28:10 -0400 Subject: [PATCH] fix stupid mistake --- src/norGate.cpp | 8 +++++++- src/orGate.cpp | 8 +++++++- src/xnorGate.cpp | 9 +++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/norGate.cpp b/src/norGate.cpp index 2b89207..5d4b949 100644 --- a/src/norGate.cpp +++ b/src/norGate.cpp @@ -3,7 +3,13 @@ using namespace std; norGate::norGate(priority_queue *eQueue, int d, wire* wire1, wire* wire2, - wire* wire3) : e(eQueue), delay(d), in1(wire1), in2(wire2), out(wire3); + wire* wire3) { + e = eQueue; + delay = d; + in1 = wire1; + in2 = wire2; + out = wire3; +} void norGate::evaluate(int evTime) { //TODO diff --git a/src/orGate.cpp b/src/orGate.cpp index c682da9..649c300 100644 --- a/src/orGate.cpp +++ b/src/orGate.cpp @@ -3,7 +3,13 @@ using namespace std; orGate::orGate(priority_queue *eQueue, int d, wire* wire1, wire* wire2, - wire* wire3) : e(eQueue), delay(d), in1(wire1), in2(wire2), out(wire3); + wire* wire3) { + e = eQueue; + delay = d; + in1 = wire1; + in2 = wire2; + out = wire3; +} void orGate::evaluate(int evTime) { //TODO diff --git a/src/xnorGate.cpp b/src/xnorGate.cpp index 0a590c8..3779fe0 100644 --- a/src/xnorGate.cpp +++ b/src/xnorGate.cpp @@ -3,8 +3,13 @@ using namespace std; xnorGate::xnorGate(priority_queue *eQueue, int d, wire* wire1, - wire* wire2, wire* wire3) : e(eQueue), delay(d), in1(wire1), in2(wire2), - out(wire3); + wire* wire2, wire* wire3) { + e = eQueue; + delay = d; + in1 = wire1; + in2 = wire2; + out = wire3; +} void xnorGate::evaluate(int evTime) { //TODO