diff options
| author | Connor McDowell <[email protected]> | 2024-01-25 17:40:27 -0800 |
|---|---|---|
| committer | Connor McDowell <[email protected]> | 2024-01-25 17:40:27 -0800 |
| commit | b903b5cc5f8135d8450cb573daba0c6cf9f8137a (patch) | |
| tree | 429678c30842d7da566078cc795cf1c11aa2b38c | |
| parent | ready 1 (diff) | |
| download | in-class-exercise-6-connormcdowell275-b903b5cc5f8135d8450cb573daba0c6cf9f8137a.tar.xz in-class-exercise-6-connormcdowell275-b903b5cc5f8135d8450cb573daba0c6cf9f8137a.zip | |
functions and returns added
| -rw-r--r-- | .vs/Excersize 6/FileContentIndex/2801589c-86a5-4992-b77c-e5a17980320a.vsidx | bin | 0 -> 107 bytes | |||
| -rw-r--r-- | .vs/Excersize 6/FileContentIndex/7e3becb0-e9e3-454c-b989-3a96894cba31.vsidx | bin | 0 -> 1675 bytes | |||
| -rw-r--r-- | .vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx | bin | 0 -> 2324 bytes | |||
| -rw-r--r-- | .vs/Excersize 6/v17/.suo | bin | 27648 -> 33280 bytes | |||
| -rw-r--r-- | .vs/Excersize 6/v17/Browse.VC.db | bin | 401408 -> 10788864 bytes | |||
| -rw-r--r-- | .vs/Excersize 6/v17/ipch/AutoPCH/39b3f133dd2d2f9b/VCTMP19756_335474.EXCERSIZE 6.00000000.ipch | bin | 0 -> 38141952 bytes | |||
| -rw-r--r-- | .vs/Excersize 6/v17/ipch/AutoPCH/e6ef09d98e791024/EXCERSIZE 6.ipch | bin | 0 -> 38141952 bytes | |||
| -rw-r--r-- | Excersize 6.cpp | 34 | ||||
| -rw-r--r-- | helper.h | 9 |
9 files changed, 30 insertions, 13 deletions
diff --git a/.vs/Excersize 6/FileContentIndex/2801589c-86a5-4992-b77c-e5a17980320a.vsidx b/.vs/Excersize 6/FileContentIndex/2801589c-86a5-4992-b77c-e5a17980320a.vsidx Binary files differnew file mode 100644 index 0000000..70aef67 --- /dev/null +++ b/.vs/Excersize 6/FileContentIndex/2801589c-86a5-4992-b77c-e5a17980320a.vsidx diff --git a/.vs/Excersize 6/FileContentIndex/7e3becb0-e9e3-454c-b989-3a96894cba31.vsidx b/.vs/Excersize 6/FileContentIndex/7e3becb0-e9e3-454c-b989-3a96894cba31.vsidx Binary files differnew file mode 100644 index 0000000..f4d18fc --- /dev/null +++ b/.vs/Excersize 6/FileContentIndex/7e3becb0-e9e3-454c-b989-3a96894cba31.vsidx diff --git a/.vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx b/.vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx Binary files differnew file mode 100644 index 0000000..08d904a --- /dev/null +++ b/.vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx diff --git a/.vs/Excersize 6/v17/.suo b/.vs/Excersize 6/v17/.suo Binary files differindex ab1c5ab..091c3a4 100644 --- a/.vs/Excersize 6/v17/.suo +++ b/.vs/Excersize 6/v17/.suo diff --git a/.vs/Excersize 6/v17/Browse.VC.db b/.vs/Excersize 6/v17/Browse.VC.db Binary files differindex 28af97c..e4f4154 100644 --- a/.vs/Excersize 6/v17/Browse.VC.db +++ b/.vs/Excersize 6/v17/Browse.VC.db 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 Binary files differnew file mode 100644 index 0000000..81a0ae2 --- /dev/null +++ b/.vs/Excersize 6/v17/ipch/AutoPCH/39b3f133dd2d2f9b/VCTMP19756_335474.EXCERSIZE 6.00000000.ipch diff --git a/.vs/Excersize 6/v17/ipch/AutoPCH/e6ef09d98e791024/EXCERSIZE 6.ipch b/.vs/Excersize 6/v17/ipch/AutoPCH/e6ef09d98e791024/EXCERSIZE 6.ipch Binary files differnew file mode 100644 index 0000000..7e03857 --- /dev/null +++ b/.vs/Excersize 6/v17/ipch/AutoPCH/e6ef09d98e791024/EXCERSIZE 6.ipch 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; } @@ -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 |