Using C++ 11-style loops for Employee example

Grzegorz Jabłoński
1 parent d2e095ca
Showing 2 changed files with 6 additions and 17 deletions
examples05/01-employee/employee1.cpp
examples05/01-employee/employee2.cpp
@@ -33,13 +33,8 @@ class Manager : public Employee {
 void print_list(set<Employee*>& s)
 {
-    for (set<Employee*>::const_iterator p = s.begin(); p != s.end(); ++p)
-        (*p)->print();
-}
-
-void print_list_2(set<Employee*>& s)
-{
-    for_each(s.begin(), s.end(), mem_fun(&Employee::print));
+    for (Employee* p : s)
+        p->print();
 }
 int main()
@@ -49,5 +44,5 @@ int main()
     set<Employee*> empl;
     empl.insert(&e);
     empl.insert(&m);
-    print_list_2(empl);
+    print_list(empl);
 }
@@ -34,15 +34,9 @@ class Manager : public Employee {
 void print_list(set<Employee*>& s)
 {
-    for (set<Employee*>::const_iterator p = s.begin(); p != s.end(); ++p)
-        (*p)->print();
+    for (Employee* p : s)
+        p->print();
 }
-
-void print_list_2(set<Employee*>& s)
-{
-    for_each(s.begin(), s.end(), mem_fun(&Employee::print));
-}
-
 int main()
 {
     Employee e("Brown", 1234);
@@ -50,5 +44,5 @@ int main()
     set<Employee*> empl;
     empl.insert(&e);
     empl.insert(&m);
-    print_list_2(empl);
+    print_list(empl);
 }