diff options
author | RossTheRoss <msattr@gmail.com> | 2019-02-07 19:04:03 +0000 |
---|---|---|
committer | RossTheRoss <msattr@gmail.com> | 2019-02-07 19:04:03 +0000 |
commit | ef17791fa521d313f34766a7d9c6ebeea0c63ae9 (patch) | |
tree | 3e43276c89f60ed0dc316041a879e611a15347c8 /ee1301 | |
parent | Fix stupid mistake (diff) | |
download | homework-ef17791fa521d313f34766a7d9c6ebeea0c63ae9.tar homework-ef17791fa521d313f34766a7d9c6ebeea0c63ae9.tar.gz homework-ef17791fa521d313f34766a7d9c6ebeea0c63ae9.tar.bz2 homework-ef17791fa521d313f34766a7d9c6ebeea0c63ae9.tar.lz homework-ef17791fa521d313f34766a7d9c6ebeea0c63ae9.tar.xz homework-ef17791fa521d313f34766a7d9c6ebeea0c63ae9.tar.zst homework-ef17791fa521d313f34766a7d9c6ebeea0c63ae9.zip |
Fix dumb things again
Diffstat (limited to 'ee1301')
-rw-r--r-- | ee1301/wk1/lab1/strap012_lab1_c_1.cpp | 11 | ||||
-rw-r--r-- | ee1301/wk1/lab1/strap012_lab1_c_2.cpp | 1 |
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() |