aboutsummaryrefslogtreecommitdiffstats
path: root/ee1301/wk5
diff options
context:
space:
mode:
authorRossTheRoss <msattr@gmail.com>2019-03-31 19:36:00 -0500
committerRossTheRoss <msattr@gmail.com>2019-03-31 19:36:00 -0500
commitb55b14c7c7753ffa000d20b31e3f980e8174ea2b (patch)
treeaab30218b289526e4147d7144e4831364dc177ea /ee1301/wk5
parentStart HW (diff)
parentChange things (diff)
downloadhomework-b55b14c7c7753ffa000d20b31e3f980e8174ea2b.tar
homework-b55b14c7c7753ffa000d20b31e3f980e8174ea2b.tar.gz
homework-b55b14c7c7753ffa000d20b31e3f980e8174ea2b.tar.bz2
homework-b55b14c7c7753ffa000d20b31e3f980e8174ea2b.tar.lz
homework-b55b14c7c7753ffa000d20b31e3f980e8174ea2b.tar.xz
homework-b55b14c7c7753ffa000d20b31e3f980e8174ea2b.tar.zst
homework-b55b14c7c7753ffa000d20b31e3f980e8174ea2b.zip
Merge branch 'master' of github.com:RosstheRoss/TestingFun
Diffstat (limited to 'ee1301/wk5')
-rw-r--r--ee1301/wk5/lab4/partner2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ee1301/wk5/lab4/partner2.cpp b/ee1301/wk5/lab4/partner2.cpp
index ef0958c..973a44b 100644
--- a/ee1301/wk5/lab4/partner2.cpp
+++ b/ee1301/wk5/lab4/partner2.cpp
@@ -5,7 +5,7 @@ using namespace std;
string requestName();
double requestHeight(string fullName);
int requestNumberOfPartners();
-void NotinMain(string array1[], const int length1, double array2[], const int length2);
+void NotinMain(string fullName[], const int length1, double height[], const int length2);
int main()
{
@@ -46,8 +46,8 @@ int requestNumberOfPartners()
return numberOfPartners;
}
-void NotinMain(string array1[], const int length1, double array2[], const int length2) {
- cout << "If " << array1[0] << " and " << array1[1]
+void NotinMain(string fullName[], const int length1, double height[], const int length2) {
+ cout << "If " << fullName[0] << " and " << fullName[1]
<< " form a human tower, their combined height will be "
- << (array2[0] + array2[1]) << endl;
+ << (height[0] + height[1]) << endl;
} \ No newline at end of file