@ -85,6 +85,6 @@ double ConClock(double time, int startingUnit, int endingUnit);
double ConTime(double time, int startingUnit, int endingUnit);
int performOperation(int num1, char operator, int num2);
int performOperation(int num1, char operatorType, int num2);
#endif // CALCULATOR
@ -22,8 +22,8 @@ char getOperatorInput() {
}
// Calculation
int performOperation(int num1, char operator, int num2) {
switch (operator) {
int performOperation(int num1, char operatorType, int num2) {
switch (operatorType) {
case '+':
return num1 + num2;
case '-':