Merge pull request pezy#2 from pezy/master

improving ex6_17
lijiaxinnn · Oct 16, 2016 · f8967fc · f8967fc
2 parents 6c4e66f + 50e8a37
commit f8967fc
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/ch06/ex6_17.cpp b/ch06/ex6_17.cpp
@@ -1,8 +1,6 @@
 #include <iostream>
 #include <string>
 
-using std::cout;
-using std::endl;
 using std::string;
 
 bool hasUppercase(const string& str)
@@ -12,18 +10,16 @@ bool hasUppercase(const string& str)
     return false;
 }
 
-void makeLowercase(string& str)
+const string& makeLowercase(string& str)
 {
     for (auto& c : str)
         if (isupper(c)) c = tolower(c);
+    return str;
 }
 
 int main()
 {
     string str("Hello World!");
-    cout << hasUppercase(str) << endl;
-    makeLowercase(str);
-    cout << str << endl;
-
-    return 0;
+    std::cout << std::boolalpha << hasUppercase(str) << std::endl;
+    std::cout << makeLowercase(str) << std::endl;
 }