From 2e4950c23c53c6bae001e03fc590e11db4b5c1cc Mon Sep 17 00:00:00 2001 From: oerivas-star Date: Mon, 2 Feb 2026 23:33:21 -0800 Subject: [PATCH 1/2] Refactor std usage --- main.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main.cpp b/main.cpp index 5411e7a3..f8b7386f 100644 --- a/main.cpp +++ b/main.cpp @@ -16,7 +16,16 @@ int main() cout << "Addition: " << x + y << endl; cout << "Subtraction: " << x - y << endl; cout << "Multiplication: " << x * y << endl; +<<<<<<< Updated upstream cout << "Division: " << x / y << endl; +======= + + if (y == 0){ + cout << "Dviding by zero is not a number.\n"; + } else { + cout << "Division: " << x / y << endl; + } +>>>>>>> Stashed changes cout << "Remainder: " << x % y << endl; cout << "Square Root: " << sqrt(x) << endl; cout << "Square: " << pow(x, y) << endl; From 9ade3dd4bfa8aeb222199b6613283bbc950d65c5 Mon Sep 17 00:00:00 2001 From: oerivas-star Date: Mon, 2 Feb 2026 23:35:05 -0800 Subject: [PATCH 2/2] refactors out std:: closes #341 --- main.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main.cpp b/main.cpp index f8b7386f..6ffd6065 100644 --- a/main.cpp +++ b/main.cpp @@ -16,16 +16,13 @@ int main() cout << "Addition: " << x + y << endl; cout << "Subtraction: " << x - y << endl; cout << "Multiplication: " << x * y << endl; -<<<<<<< Updated upstream - cout << "Division: " << x / y << endl; -======= if (y == 0){ cout << "Dviding by zero is not a number.\n"; } else { cout << "Division: " << x / y << endl; } ->>>>>>> Stashed changes + cout << "Remainder: " << x % y << endl; cout << "Square Root: " << sqrt(x) << endl; cout << "Square: " << pow(x, y) << endl;