aboutsummaryrefslogtreecommitdiffstats
path: root/ee1301/wk1/lab1
diff options
context:
space:
mode:
Diffstat (limited to 'ee1301/wk1/lab1')
-rw-r--r--ee1301/wk1/lab1/strap012_lab1_c_1.cpp11
-rw-r--r--ee1301/wk1/lab1/strap012_lab1_c_2.cpp1
2 files changed, 8 insertions, 4 deletions
diff --git a/ee1301/wk1/lab1/strap012_lab1_c_1.cpp b/ee1301/wk1/lab1/strap012_lab1_c_1.cpp
index 3569e62..e3cdcdb 100644
--- a/ee1301/wk1/lab1/strap012_lab1_c_1.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_c_1.cpp
@@ -1,21 +1,24 @@
#include <iostream>
+#include <string>
using namespace std;
int main()
{
- string name1, name2;
+ string name1;
+ string name2;
int h1, h2;
cout << "Enter your name: ";
- cin >> name1;
+ getline (cin,name1);
cout << "Enter your height: ";
cin >> h1;
cout << "Enter your comrade's name: ";
- cin >> name2;
+ cin.ignore();
+ getline (cin,name2);
cout << "Enter your comrade's height: ";
cin >> h2;
- cout << name1 << " and " << name2 << " standing on top of each other are " << h1+h2 << " feet tall!";
+ cout << name1 << " and " << name2 << " standing on top of each other are " << h1+h2 << " feet tall!" << endl;
}
diff --git a/ee1301/wk1/lab1/strap012_lab1_c_2.cpp b/ee1301/wk1/lab1/strap012_lab1_c_2.cpp
index 941d8de..46efd7e 100644
--- a/ee1301/wk1/lab1/strap012_lab1_c_2.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_c_2.cpp
@@ -1,4 +1,5 @@
#include <iostream>
+#include <string>
using namespace std;
int main()