From b903b5cc5f8135d8450cb573daba0c6cf9f8137a Mon Sep 17 00:00:00 2001 From: Connor McDowell Date: Thu, 25 Jan 2024 17:40:27 -0800 Subject: functions and returns added --- .../2801589c-86a5-4992-b77c-e5a17980320a.vsidx | Bin 0 -> 107 bytes .../7e3becb0-e9e3-454c-b989-3a96894cba31.vsidx | Bin 0 -> 1675 bytes .../b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx | Bin 0 -> 2324 bytes .vs/Excersize 6/v17/.suo | Bin 27648 -> 33280 bytes .vs/Excersize 6/v17/Browse.VC.db | Bin 401408 -> 10788864 bytes .../VCTMP19756_335474.EXCERSIZE 6.00000000.ipch | Bin 0 -> 38141952 bytes .../ipch/AutoPCH/e6ef09d98e791024/EXCERSIZE 6.ipch | Bin 0 -> 38141952 bytes Excersize 6.cpp | 34 ++++++++++++++++----- helper.h | 9 +++--- 9 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 .vs/Excersize 6/FileContentIndex/2801589c-86a5-4992-b77c-e5a17980320a.vsidx create mode 100644 .vs/Excersize 6/FileContentIndex/7e3becb0-e9e3-454c-b989-3a96894cba31.vsidx create mode 100644 .vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx create mode 100644 .vs/Excersize 6/v17/ipch/AutoPCH/39b3f133dd2d2f9b/VCTMP19756_335474.EXCERSIZE 6.00000000.ipch create mode 100644 .vs/Excersize 6/v17/ipch/AutoPCH/e6ef09d98e791024/EXCERSIZE 6.ipch diff --git a/.vs/Excersize 6/FileContentIndex/2801589c-86a5-4992-b77c-e5a17980320a.vsidx b/.vs/Excersize 6/FileContentIndex/2801589c-86a5-4992-b77c-e5a17980320a.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/Excersize 6/FileContentIndex/2801589c-86a5-4992-b77c-e5a17980320a.vsidx differ diff --git a/.vs/Excersize 6/FileContentIndex/7e3becb0-e9e3-454c-b989-3a96894cba31.vsidx b/.vs/Excersize 6/FileContentIndex/7e3becb0-e9e3-454c-b989-3a96894cba31.vsidx new file mode 100644 index 0000000..f4d18fc Binary files /dev/null and b/.vs/Excersize 6/FileContentIndex/7e3becb0-e9e3-454c-b989-3a96894cba31.vsidx differ diff --git a/.vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx b/.vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx new file mode 100644 index 0000000..08d904a Binary files /dev/null and b/.vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx differ diff --git a/.vs/Excersize 6/v17/.suo b/.vs/Excersize 6/v17/.suo index ab1c5ab..091c3a4 100644 Binary files a/.vs/Excersize 6/v17/.suo and b/.vs/Excersize 6/v17/.suo differ diff --git a/.vs/Excersize 6/v17/Browse.VC.db b/.vs/Excersize 6/v17/Browse.VC.db index 28af97c..e4f4154 100644 Binary files a/.vs/Excersize 6/v17/Browse.VC.db and b/.vs/Excersize 6/v17/Browse.VC.db differ diff --git a/.vs/Excersize 6/v17/ipch/AutoPCH/39b3f133dd2d2f9b/VCTMP19756_335474.EXCERSIZE 6.00000000.ipch b/.vs/Excersize 6/v17/ipch/AutoPCH/39b3f133dd2d2f9b/VCTMP19756_335474.EXCERSIZE 6.00000000.ipch new file mode 100644 index 0000000..81a0ae2 Binary files /dev/null and b/.vs/Excersize 6/v17/ipch/AutoPCH/39b3f133dd2d2f9b/VCTMP19756_335474.EXCERSIZE 6.00000000.ipch differ diff --git a/.vs/Excersize 6/v17/ipch/AutoPCH/e6ef09d98e791024/EXCERSIZE 6.ipch b/.vs/Excersize 6/v17/ipch/AutoPCH/e6ef09d98e791024/EXCERSIZE 6.ipch new file mode 100644 index 0000000..7e03857 Binary files /dev/null and b/.vs/Excersize 6/v17/ipch/AutoPCH/e6ef09d98e791024/EXCERSIZE 6.ipch differ diff --git a/Excersize 6.cpp b/Excersize 6.cpp index b4af816..ad1e3a2 100644 --- a/Excersize 6.cpp +++ b/Excersize 6.cpp @@ -7,21 +7,39 @@ #include "helper.h" + int main() { - int mySum = sum(15, 30); - std::cout << mySum << std::endl; - std::cout << returnInt() << std::endl; - std::cout << percentage(40, 78) << std::endl; - std::cout << FtoC(56) << std::endl; - std::cout << CtoF(120) << std::endl; + + return 0; +} + +int math() +{ + + + return 0; +} + +int math(int square = 2) +{ + + + return square * square; +} + +int math(int a, int b) +{ + + + return a + b; } -int returnInt() +int math(int A, int B, int C, int x) { - return 10; + return A * x * x - B * x + C; } diff --git a/helper.h b/helper.h index 39f5d52..dd765c5 100644 --- a/helper.h +++ b/helper.h @@ -1,15 +1,14 @@ #ifndef MY_HEADER_FILE_H #define MY_HEADER_FILE_H -int returnInt(); +int math(); -int sum(int a, int b); +int math(int square = 2); -float percentage(int a, int b); +int math(int a, int b); -float FtoC(int fah); +int math(int A, int B, int C, int x); -float CtoF(int cel); #endif MY_HEADER_FILE_H -- cgit v1.2.3