summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor McDowell <[email protected]>2024-01-25 17:44:12 -0800
committerConnor McDowell <[email protected]>2024-01-25 17:44:12 -0800
commit8e1df8203c4d864217f7fcefeffff47c7df95715 (patch)
tree3ec32059c7de5f98df7a5ec1b9606ed7f25ae2c9
parentfunctions and returns added (diff)
downloadarchived-in-class-exercise-6-connormcdowell275-8e1df8203c4d864217f7fcefeffff47c7df95715.tar.xz
archived-in-class-exercise-6-connormcdowell275-8e1df8203c4d864217f7fcefeffff47c7df95715.zip
test comit
-rw-r--r--.vs/Excersize 6/FileContentIndex/2ef2dc64-9df8-41c5-83a7-c81d588ba67e.vsidxbin0 -> 107 bytes
-rw-r--r--.vs/Excersize 6/FileContentIndex/68d87074-988e-411f-ae5e-079f75a16c27.vsidxbin0 -> 107 bytes
-rw-r--r--.vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidxbin2324 -> 0 bytes
-rw-r--r--.vs/Excersize 6/v17/.suobin33280 -> 26112 bytes
-rw-r--r--.vs/Excersize 6/v17/Browse.VC.dbbin10788864 -> 10797056 bytes
-rw-r--r--.vs/Excersize 6/v17/ipch/AutoPCH/2025de08a915e4fc/EXCERSIZE 6.ipchbin0 -> 38141952 bytes
-rw-r--r--.vs/Excersize 6/v17/ipch/AutoPCH/7f22732d17d245c3/EXCERSIZE 6.ipchbin0 -> 38141952 bytes
-rw-r--r--.vs/Excersize 6/v17/ipch/AutoPCH/e03e363d15347411/VCTMP30828_957304.EXCERSIZE 6.00000000.ipchbin0 -> 38141952 bytes
-rw-r--r--.vs/ProjectSettings.json2
-rw-r--r--.vs/VSWorkspaceState.json1
-rw-r--r--.vs/in-class-exercise-6-connormcdowell275/v17/.wsuobin25600 -> 27648 bytes
-rw-r--r--.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.dbbin188416 -> 401408 bytes
-rw-r--r--.vs/slnx.sqlitebin90112 -> 315392 bytes
-rw-r--r--Excersize 6.cpp9
14 files changed, 6 insertions, 6 deletions
diff --git a/.vs/Excersize 6/FileContentIndex/2ef2dc64-9df8-41c5-83a7-c81d588ba67e.vsidx b/.vs/Excersize 6/FileContentIndex/2ef2dc64-9df8-41c5-83a7-c81d588ba67e.vsidx
new file mode 100644
index 0000000..70aef67
--- /dev/null
+++ b/.vs/Excersize 6/FileContentIndex/2ef2dc64-9df8-41c5-83a7-c81d588ba67e.vsidx
Binary files differ
diff --git a/.vs/Excersize 6/FileContentIndex/68d87074-988e-411f-ae5e-079f75a16c27.vsidx b/.vs/Excersize 6/FileContentIndex/68d87074-988e-411f-ae5e-079f75a16c27.vsidx
new file mode 100644
index 0000000..70aef67
--- /dev/null
+++ b/.vs/Excersize 6/FileContentIndex/68d87074-988e-411f-ae5e-079f75a16c27.vsidx
Binary files 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
deleted file mode 100644
index 08d904a..0000000
--- a/.vs/Excersize 6/FileContentIndex/b1123cc1-54b9-4756-a8a2-6189d999766f.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/Excersize 6/v17/.suo b/.vs/Excersize 6/v17/.suo
index 091c3a4..aed2adb 100644
--- a/.vs/Excersize 6/v17/.suo
+++ b/.vs/Excersize 6/v17/.suo
Binary files differ
diff --git a/.vs/Excersize 6/v17/Browse.VC.db b/.vs/Excersize 6/v17/Browse.VC.db
index e4f4154..e0efbbe 100644
--- a/.vs/Excersize 6/v17/Browse.VC.db
+++ b/.vs/Excersize 6/v17/Browse.VC.db
Binary files differ
diff --git a/.vs/Excersize 6/v17/ipch/AutoPCH/2025de08a915e4fc/EXCERSIZE 6.ipch b/.vs/Excersize 6/v17/ipch/AutoPCH/2025de08a915e4fc/EXCERSIZE 6.ipch
new file mode 100644
index 0000000..244cee4
--- /dev/null
+++ b/.vs/Excersize 6/v17/ipch/AutoPCH/2025de08a915e4fc/EXCERSIZE 6.ipch
Binary files differ
diff --git a/.vs/Excersize 6/v17/ipch/AutoPCH/7f22732d17d245c3/EXCERSIZE 6.ipch b/.vs/Excersize 6/v17/ipch/AutoPCH/7f22732d17d245c3/EXCERSIZE 6.ipch
new file mode 100644
index 0000000..fdb81ed
--- /dev/null
+++ b/.vs/Excersize 6/v17/ipch/AutoPCH/7f22732d17d245c3/EXCERSIZE 6.ipch
Binary files differ
diff --git a/.vs/Excersize 6/v17/ipch/AutoPCH/e03e363d15347411/VCTMP30828_957304.EXCERSIZE 6.00000000.ipch b/.vs/Excersize 6/v17/ipch/AutoPCH/e03e363d15347411/VCTMP30828_957304.EXCERSIZE 6.00000000.ipch
new file mode 100644
index 0000000..821d38c
--- /dev/null
+++ b/.vs/Excersize 6/v17/ipch/AutoPCH/e03e363d15347411/VCTMP30828_957304.EXCERSIZE 6.00000000.ipch
Binary files differ
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
index f8b4888..0cf5ea5 100644
--- a/.vs/ProjectSettings.json
+++ b/.vs/ProjectSettings.json
@@ -1,3 +1,3 @@
{
- "CurrentProjectSetting": null
+ "CurrentProjectSetting": "No Configurations"
} \ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index 555e6cc..fe19481 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -3,5 +3,6 @@
"",
"\\.github"
],
+ "SelectedNode": "\\Excersize 6.sln",
"PreviewInSolutionExplorer": false
} \ No newline at end of file
diff --git a/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo b/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo
index 5bfdaa2..784671a 100644
--- a/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo
+++ b/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo
Binary files differ
diff --git a/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db b/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db
index f3a5061..c3c847f 100644
--- a/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db
+++ b/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db
Binary files differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 0e95ecc..681a5ef 100644
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
Binary files differ
diff --git a/Excersize 6.cpp b/Excersize 6.cpp
index ad1e3a2..d1177e9 100644
--- a/Excersize 6.cpp
+++ b/Excersize 6.cpp
@@ -10,8 +10,7 @@
int main()
{
-
-
+ std::cout << math();
return 0;
@@ -24,21 +23,21 @@ int math()
return 0;
}
-int math(int square = 2)
+int mathSquare(int square)
{
return square * square;
}
-int math(int a, int b)
+int mathSum(int a, int b = 2)
{
return a + b;
}
-int math(int A, int B, int C, int x)
+int mathOverload(int A, int B, int C, int x)
{
return A * x * x - B * x + C;