improved ch07

coderbradlee · Jun 24, 2015 · a0fea7b · a0fea7b
1 parent c638184
commit a0fea7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/ch07/ex7_05.h b/ch07/ex7_05.h
@@ -14,9 +14,9 @@
 class Person {
     std::string name;
     std::string address;
-    
-    std::string getName() const { return name; }
-    std::string getAddress() const { return address; }
+public:
+    const std::string& getName() const { return name; }
+    const std::string& getAddress() const { return address; }
 };
 
 #endif

diff --git a/ch07/ex7_09.h b/ch07/ex7_09.h
@@ -13,16 +13,17 @@
 #include <iostream>
 
 struct Person {
-    std::string getName() const { return name; }
-    std::string getAddress() const { return address; }
-    
+    const std::string& getName() const { return name; }
+    const std::string& getAddress() const { return address; }
+
     std::string name;
     std::string address;
 };
 
 std::istream &read(std::istream &is, Person &person)
 {
     is >> person.name >> person.address;
+    if (!is) person = Person();
     return is;
 }